Use triple braces by default.
Note filter_var usage in docs.
Merge branch '4.1'