tim-kretschmer-c2fo/ci-test — pull request #151 by tim-kretschmer-c2fo-ci-test (2014-06-20 15:42:29+00:00)
Title: Merge dev/cfo-1913-89fbba26-4be5-4c2a-b2c1-77282745f5fa into development

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

Code Review

- [ ] @importantguy
- [ ] @supercritical