Merge pull request #1 from LMAX-Exchange/master

update to 3.0 b2