Merge branch 'master' into bug561391

Change-Id: I2b68b0cd23c59a4185e4dec81346561245b48e8a