Check for frame_obj2 exists
Merge remote-tracking branch 'origin/saxswaxs' into saxswaxs

Conflicts:
	scatterbrain__define.pro