Merge py3 engine stuff into trunk
Authored by: klaussfreire 2013-03-28
Parent: [r13602]
Child: [r13604]