idiotic help fix (this counts in v1)
Merge remote-tracking branch 'origin/master' into gh-pages