Forceful test fix to master.
Merge branch 'master' into module

Conflicts:
	controllers/author_controller.py