Fix MASSIVE upgrade bug about migrations not being executed properly
Merge branch '0.23'

Conflicts:
	CHANGES
Bump version