and here. we. go.
Merge branch 'master' into gh-pages