tim-kretschmer-c2fo/ci-test — pull request #78 by tim-kretschmer-c2fo-ci-test (2014-06-20 15:41:23+00:00)
Title: Merge stable/cfo-3522-0366c2e8-f1c3-44f1-9d26-551ca294486c into master

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

Code Review

- [ ] @importantguy
- [ ] @supercritical