This is correct after all
Merge branch 'refs/heads/2.3/develop' into 3.0/develop
Fix events - they weren't firing at all
Merge branch 'refs/heads/2.3/develop' into 3.0/develop
Added authenticate_user hook allowing import of users from outside systems.
Merge branch 'refs/heads/2.3/develop' into 3.0/develop