add one-to-one handling to VersionableBehavior
Merge pull request #647 from havvg/feature/versionable-one-to-one

add one-to-one handling to VersionableBehavior
Merge remote branch 'upstream/master'