Merge branch 'hotfix/shelve332'
Merge branch 'develop'
Better documentation for auth plugins
Fixing annoying case of incorrect URL
Merge branch 'hotfix/invalid_url_242' into develop