Fixes #556
Merge branch 'master' of github.com:shoestrap/shoestrap-3