tim-kretschmer-c2fo/ci-test — pull request #96 by tim-kretschmer-c2fo-ci-test (2014-06-20 15:41:39+00:00)
Title: Merge stable/cfo-3416-7f63b492-7439-4baa-912b-91ac09a55ab3 into master

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

Code Review

- [ ] @importantguy
- [ ] @supercritical