Merge "Per 5a4a33a, remove support for magic quotes gpc"