Reattach...?
Merge branch 'reattach'

Conflicts:
	src/IRenderer.cpp
	src/IWindow.cpp