fix oas ticket 90/98
Merge branch 'master' into OAS-dev

Conflicts:
	constants.php