tim-kretschmer-c2fo/ci-test — pull request #82 by tim-kretschmer-c2fo-ci-test (2014-06-20 15:41:27+00:00)
Title: Merge stable/cfo-1027-133c8f91-dd51-40ea-99d8-74e8d8bcd725 into master

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

Code Review

- [ ] @importantguy
- [ ] @supercritical