tim-kretschmer-c2fo/ci-test — pull request #140 by tim-kretschmer-c2fo-ci-test (2014-06-20 15:42:19+00:00)
Title: Merge stable/cfo-1957-1d30249a-ddcf-4586-8d15-973c4b5e5d52 into master

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

Code Review

- [ ] @importantguy
- [ ] @supercritical