Fix typos
Merge branch 'develop' of https://github.com/always-on/always into develop
Merge remote-tracking branch 'upstream/develop' into develop