Merge branch 'develop'
release 0.11.10
0.11.11: add bodyclass/bodyid support
Merge branch 'master' into develop
don't try to save a version on the parent if there is no parent