Add OAUTH2 candidates to FIXME.md
Merge remote-tracking branch 'origin/develop' into brokenstuff