(MS Build files updated)
Merge remote-tracking branch 'origin/master' into linux