Merge VideoSprint59 conflicts:
extensions/FBConnect/prefs.js