bolt/bolt — pull request #2371 by bobdenotter (2014-12-30 15:42:16+00:00)
Title: Feature/grunt a little quicker

Note: Do not merge in, until _after_ @rarila's patch has been merged in successfully.