Fix typo that was causing incorrect devstate to be set.
Update for license file
Merge branch 'release/2.11' into develop

Conflicts:
	functions.inc.php