Merge pull request #2001 from ethomson/merge_version_validate Validate struct versions in merge, revert
2013-12-12T14:58:18