tim-kretschmer-c2fo/ci-test — pull request #132 by tim-kretschmer-c2fo-ci-test (2014-06-20 15:42:12+00:00)
Title: Merge stable/cfo-2231-ea7caed3-9a30-497c-bf9f-d136031dec97 into master

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

Code Review

- [ ] @importantguy
- [ ] @supercritical