tim-kretschmer-c2fo/ci-test — pull request #144 by tim-kretschmer-c2fo-ci-test (2014-06-20 15:42:22+00:00)
Title: Merge stable/cfo-1579-42a02b81-c7d8-4464-a890-e1f7c8959d64 into master

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

Code Review

- [ ] @importantguy
- [ ] @supercritical