Merge "disallow SIOCATMARK"