tim-kretschmer-c2fo/ci-test — pull request #33 by tim-kretschmer-c2fo-ci-test (2014-06-20 15:36:18+00:00)
Title: Merge stable/cfo-1613-ed375f63-0e52-45b8-9b2d-251a5f827131 into master

https://honeycomb.jira.com/browse/CFO-1613

Code Review

- [ ] @importantguy
- [ ] @supercritical