Fixed merge issue
Merge branch 'master' of github.com:OpenHFT/Java-Lang