bolt/bolt — pull request #1535 by adrianguenter (2014-08-16 22:39:17+00:00)
Title: Refactor/1531

Closes #1531