tim-kretschmer-c2fo/ci-test — pull request #40 by tim-kretschmer-c2fo-ci-test (2014-06-20 15:36:26+00:00)
Title: Merge dev/cfo-2099-051c8e3c-d905-4c15-af2b-d8872dfb0ec9 into development

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

Code Review

- [ ] @importantguy
- [ ] @supercritical