Merge remote-tracking branch 'sherief/webchat_patches'
Merge branch 'master' into bug12153