Change password back to normal.
Merge remote-tracking branch 'origin/Release13' into Release13