tim-kretschmer-c2fo/ci-test — pull request #110 by tim-kretschmer-c2fo-ci-test (2014-06-20 15:41:51+00:00)
Title: Merge stable/cfo-3869-8294a40f-6090-45cc-9121-b8a24f0b1b68 into master

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

Code Review

- [ ] @importantguy
- [ ] @supercritical