Merge "Don't throw E_NOTICEs about undefined properties"