tim-kretschmer-c2fo/ci-test — pull request #104 by tim-kretschmer-c2fo-ci-test (2014-06-20 15:41:46+00:00)
Title: Merge stable/cfo-1803-c7c7a11f-0d67-470c-8758-876068c8aec4 into master

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

Code Review

- [ ] @importantguy
- [ ] @supercritical