Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
prepare for 0.9-10
Merge branch 'master' into develop