Merge branch 'master' into always_default_drive

Conflicts:
	picard/util/cdrom.py