fixes englishtown/gudstrap#73
Merge branch 'develop' into gh-pages