1.9.0
manually updated 1.11 MixedCase to lowercase originating from 1.10
Merge branch '1.9' into 1.11

Conflicts:
	Controllers/Sample.php
	controllers/sample.php