tim-kretschmer-c2fo/ci-test — pull request #122 by tim-kretschmer-c2fo-ci-test (2014-06-20 15:42:03+00:00)
Title: Merge stable/cfo-3457-527cb53e-93ef-43e5-a109-75a4104fbd5c into master

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

Code Review

- [ ] @importantguy
- [ ] @supercritical