Fix error when block is uninstalled and then later reinstalled
Merge remote-tracking branch 'origin/master'

Conflicts:
	db/install.php