Fix a name conflict.
Merge branch 'master' into Authentication