yo template 1.0.6-1
Merge branch 'master' into develop