Xmx for OOME
Merge branch 'master' into allenday