Merge branch 'master' into bea
Merge remote-tracking branch 'origin/master'