tim-kretschmer-c2fo/ci-test — pull request #155 by tim-kretschmer-c2fo-ci-test (2014-06-20 15:42:34+00:00)
Title: Merge stable/cfo-3265-7f32e3db-d247-4178-834a-a850fb2d50a8 into master

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

Code Review

- [ ] @importantguy
- [ ] @supercritical