tim-kretschmer-c2fo/ci-test — pull request #90 by tim-kretschmer-c2fo-ci-test (2014-06-20 15:41:33+00:00)
Title: Merge stable/cfo-3170-c8328f5d-bd46-42a3-a8cd-8b0acf95463e into master

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

Code Review

- [ ] @importantguy
- [ ] @supercritical