OpenCV has merge conflicts now
Merge remote-tracking branch 'upstream/master' into buildFiles
Merge pull request #1115 from jaypoulz/buildFiles

Build files