tim-kretschmer-c2fo/ci-test — pull request #128 by tim-kretschmer-c2fo-ci-test (2014-06-20 15:42:09+00:00)
Title: Merge stable/cfo-3577-af21454d-109f-49b4-b20c-dc1622129900 into master

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

Code Review

- [ ] @importantguy
- [ ] @supercritical