Merge branch 'release/0.16.0'
Merge branch 'master' of github.com:rapidsms/rapidsms into develop
Merge branch 'develop' of github.com:rapidsms/rapidsms into develop