Merge branch 'master' into develop
Fixing another bug related to multiple preconditions.
Same fix for post conditions.
Version bump.
Merge branch 'develop'