tim-kretschmer-c2fo/ci-test — pull request #120 by tim-kretschmer-c2fo-ci-test (2014-06-20 15:42:01+00:00)
Title: Merge stable/cfo-1189-e4e952c9-896c-4569-85f5-bf433320b29e into master

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

Code Review

- [ ] @importantguy
- [ ] @supercritical