Fix to make sure edited bots are saved.
Merge branch 'master' into oauth_changes