Merge master changes into mozilla_sync_1.2 branch