Ensure that the user record is read, so that all substitutions can happen correctly
Fix problem where notices cause logout problems
Don't force subkeys into objects that don't exist
Merge remote-tracking branch 'upstream/master'