Merge branch 'master' into develop
don't try to save a version on the parent if there is no parent
release 0.11.12
code style fix