remap change
piu
fixed
Merge branch 'remap_space'

Conflicts:
	CHANGES.txt