Fixes #550.
Merge branch 'master' of https://github.com/bolt/bolt