Working on #1377
Merge branch 'master' of github.com:bolt/bolt