tim-kretschmer-c2fo/ci-test — pull request #60 by tim-kretschmer-c2fo-ci-test (2014-06-20 15:41:09+00:00)
Title: Merge stable/cfo-3956-0a7b5ecf-ca23-4b82-b385-84d920974b04 into master

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

Code Review

- [ ] @importantguy
- [ ] @supercritical