Fixing some notices caused by parse errors in class and function declarations. Possible fix for #316.
Merge branch 'master' into phpcs-fixer

Conflicts:
	CodeSniffer/Standards/PSR2/Sniffs/Classes/ClassDeclarationSniff.php
	CodeSniffer/Tokenizers/PHP.php