Minor changes from 1.0.0.rc2
Merge branch 'development'