Merge pull request #797 from jmarshallnz/python_add_remove_controls_via_message