'render'
WiP - almost complete
complete. tested with XE2, too
Merge branch 'render'