Merging
Merge branch 'release/1.6' of github.com:bolt/bolt into release/1.6
Merging