Not so ugly fix for previous ugly fix
Merge branch 'develop'
Merge branch 'master' into custom