Merge pull request #1 from LMAX-Exchange/master

merge from master