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

* origin/master:
  cleanup
deploy