Merge branch 'fix-tootdon-oauth' into 'develop'