issue #1004

Conflicts:
	js/actions/api-database.js