Bug #63358.
Merge branch 'master' into ascraeus