Merge remote-tracking branch 'public/bug6538'