tim-kretschmer-c2fo/ci-test — pull request #138 by tim-kretschmer-c2fo-ci-test (2014-06-20 15:42:17+00:00)
Title: Merge stable/cfo-1006-7b949a02-0d0f-4c15-8c08-d18f6c174528 into master

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

Code Review

- [ ] @importantguy
- [ ] @supercritical