tim-kretschmer-c2fo/ci-test — pull request #66 by tim-kretschmer-c2fo-ci-test (2014-06-20 15:41:14+00:00)
Title: Merge stable/cfo-3418-877b5fe6-b9c1-4d63-994b-93b30ae0e495 into master

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

Code Review

- [ ] @importantguy
- [ ] @supercritical