Merge branch 'refs/heads/master' into gh-pages I think this finally does it.
Hopefully merging with Master.