Merged Python changes from Lambda Wars.