Issue #2216945 by asrob: Remove duplicate ingroup in filter_xss
Merge branch '7.x' into 7.x-autoload