[FEATURE] Adding support for more recent contribs

Allows building with VS 12.