tim-kretschmer-c2fo/ci-test — pull request #142 by tim-kretschmer-c2fo-ci-test (2014-06-20 15:42:21+00:00)
Title: Merge stable/cfo-2634-c7e57a6f-fe97-479c-8f57-80b27c550826 into master

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

Code Review

- [ ] @importantguy
- [ ] @supercritical