Properly reference $enable_authz variable.
Merge remote-tracking branch 'origin/master'