merged python fix from RC_0_16