VC2013

3rd times a charm?
Merge remote-tracking branch 'upstream/master'
Merge pull request #328 from mborland/master

VC2013 Build Files