Merge branch 'master' into sstehly-master
Merge branch 'sstehly-master' of https://github.com/taabi/Blank into sstehly-master