Merge remote-tracking branch 'origin/master' into 1.0.0

Conflicts:
	src/ApiDefinition.php
	src/Parser.php
	src/QueryParameter.php
	test/ParseTest.php