It is 12:30am and I can't really say what this commit is for. Home time!!!!
Merge branch 'master' into gh-pages