Un-revert r13505 & r13507, prior to merging py3 python changes
Authored by: klaussfreire 2013-03-29
Parent: [r13607]
Child: [r13609]