Commit 86a05ef382438b22d2ffaaa1a77814781243bc80

Edward Thomson 2013-12-12T17:40:40

Validate struct versions in merge, revert