Fix typo
Merge remote-tracking branch 'mozilla/v2.0' into v2.0

Conflicts:
	controller/base_controller.py
Merge pull request #176 from askeing/v2.0

Fix typo