Generic FixmeSniff and TodoSniff now work correctly with accented characters
Merge branch 'master' into phpcs-fixer

Conflicts:
	CodeSniffer/Standards/Generic/Sniffs/Commenting/FixmeSniff.php
	CodeSniffer/Standards/Generic/Sniffs/Commenting/TodoSniff.php
	package.xml