Merge pull request #144 from bollu/master

fixed the 4xMSAA crash on android
Merge remote-tracking branch 'upstream/master'
fixed merge conflicts