Emergency bugfix
Merge branch 'develop'