Merge branch 'hotfix/coerce_unicode'
Merge branch 'develop' of https://github.com/ImaginationForPeople/assembl
Merge branch 'develop' of https://github.com/ImaginationForPeople/assembl
Merge branch 'develop'