Updated changes made on python-purple branch.