properly unquote-plus content
Merge branch 'develop' of github.com:praekelt/vumi into develop