Merge branch 'hotfix/Errai-604'
Merge branch 'master' of github.com:edewit/errai
Merge branch 'master' of github.com:edewit/errai