Merge branch 'develop' of https://github.com/always-on/always into develop