trying to fix an issue with codekit
Merge branch 'master' into gh-pages