Empty out some intermediate code and set higher QoS
Merge remote-tracking branch 'origin/master' into gh-pages