Merged updates from L4 latest beta (sha1: b16bb1ac6a425980bcc326044155fb8c87b09ff0).

- Fixes the "undefined index: domain" notice which prevents pages from being displayed.