Improved detection of nested IF statements that use the alternate IF/ENDIF syntax
Added branch alias for the 2.0.x version
Merge branch 'master' into phpcs-fixer

Conflicts:
	CodeSniffer.php
	package.xml