fixes englishtown/gudstrap#76
Merge branch 'develop' of https://github.com/englishtown/bootstrap into develop