Fix #1486 for v1.3.0

Conflicts:
	unit-tests/TagTest.php