tim-kretschmer-c2fo/ci-test — pull request #121 by tim-kretschmer-c2fo-ci-test (2014-06-20 15:42:02+00:00)
Title: Merge dev/cfo-1885-bd80aa3d-f824-4c04-92fc-fe3dcc8f1970 into development

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

Code Review

- [ ] @importantguy
- [ ] @supercritical