Merge branch 'master' into multi_rect_2

Conflicts:
	engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
	engines/wintermute/base/gfx/osystem/base_render_osystem.h
	engines/wintermute/graphics/transform_struct.h