Matt made me change object.map
Matt made me change something!
Merge branch 'master' of https://github.com/ProtoTest/Kermit

Conflicts:
	global_scripts/screen_objects/WarningDialogPopup.rb