re-applying f6f760b27ba75, see #1730
Merge branch 'master' of github.com:bolt/bolt
Merge remote-tracking branch 'upstream/master'