Added support for VS14.
Merge branch 'master' into release