Added support for Visual C++ 2012 and 2013 compilers.
Merge remote-tracking branch 'upstream/master'