tim-kretschmer-c2fo/ci-test — pull request #152 by tim-kretschmer-c2fo-ci-test (2014-06-20 15:42:29+00:00)
Title: Merge stable/cfo-1148-49ac15fb-0131-4453-94b6-cc685ffcf565 into master

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

Code Review

- [ ] @importantguy
- [ ] @supercritical