Merge branch 'hamara-sugam' of git.hamaralinux.org:hamara-developers/hamara-packages into hamara-sugam