-O2 optimization
Merge remote-tracking branch 'origin/master' into gh-pages