Bug 409792 - Plugin URLs are corrupted in the preference store
Merge remote-tracking branch 'upstream/master'