Fix errors on PHP setups that output warnings on undefined array keys
Another fix for verbose PHP installs
Merge branch 'master' into ui-update