tim-kretschmer-c2fo/ci-test — pull request #49 by tim-kretschmer-c2fo-ci-test (2014-06-20 15:36:33+00:00)
Title: Merge stable/cfo-1314-4167f6e6-7b98-42df-bf3f-236aa89860f8 into master

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

Code Review

- [ ] @importantguy
- [ ] @supercritical