Smaller PNGs
Merge remote-tracking branch 'neheb/master'
Merge remote-tracking branch 'upstream/master'