Merge branch 'freddiez'
JRE conflict