Form fix again, I don't understand gitflow...
Merge branch 'hotfix/1.0.4' into develop