[➦] Merged changes.
[➦] Merge branch 'master' into bitaculous.
[➦] Merged changes.
[➦] Merge branch 'master' into bitaculous.