Added more debug info and disabled multi-sampling for now.
Merge remote-tracking branch 'GitHub/master'