Fix what's hot
Merge branch 'develop'