Try #2 to fix index drop error on mysql
bump version number
Merge branch 'master' into 2.5.0

Conflicts:
	addon.xml