tim-kretschmer-c2fo/ci-test — pull request #22 by tim-kretschmer-c2fo-ci-test (2014-06-20 15:36:10+00:00)
Title: Merge stable/cfo-3463-5a09c867-91a8-45c9-bb3f-65851459bc27 into master

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

Code Review

- [ ] @importantguy
- [ ] @supercritical