FAKE-399: This is the squashed message
Merge pull request #3 from bedwards/feature/bedwards/FAKE-399

Feature/bedwards/fake 399