Merge remote-tracking branch 'origin/Bug-1525-and-1872'

Conflicts:
	src/kernel/move.c
This commit is contained in:
CTD 2014-08-26 09:31:18 +02:00
commit b321385f34

Diff Content Not Available