Fix #606
Merge branch 'master' of https://github.com/jhipster/generator-jhipster