Setting up for 5.0.4-RC2
Merging remote '5.0.x' onto 'java5'