issue#1001
patch
Merge branch 'issue#1001' of github.com:chubakur/bolt into issue#1001