fixed issue 1850, caching errors when unable to obtain plugin list
Merge remote-tracking branch 'upstream/master'

Conflicts:
	applications/admin/controllers/default.py