tim-kretschmer-c2fo/ci-test — pull request #70 by tim-kretschmer-c2fo-ci-test (2014-06-20 15:41:17+00:00)
Title: Merge stable/cfo-1856-3b7fc5e5-a96c-4455-baf2-0da3525e9c04 into master

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

Code Review

- [ ] @importantguy
- [ ] @supercritical