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