Merge remote-tracking branch 'origin/fix-import-chrome-bookmarks-windows' into fix-import-chrome-bookmarks-windows

# Conflicts:
#	modules/page_object_prefs.py

Author: Tracy-Walker