Merge "SECURITY: Don't allow entities in XMP with HHVM"