fixed no-auth in master for some reason
Merge branch 'master' into devel