tim-kretschmer-c2fo/ci-test — pull request #25 by tim-kretschmer-c2fo-ci-test (2014-06-20 15:36:12+00:00)
Title: Merge stable/cfo-3465-d9240c9d-f37a-4a3b-b11c-a2faab666df5 into master

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

Code Review

- [ ] @importantguy
- [ ] @supercritical