tim-kretschmer-c2fo/ci-test — pull request #32 by tim-kretschmer-c2fo-ci-test (2014-06-20 15:36:18+00:00)
Title: Merge dev/cfo-3732-828866ac-a97e-48fc-8ea7-1c012928adcd into development

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

Code Review

- [ ] @importantguy
- [ ] @supercritical