Merge commit 'ca807d6e5d828787e06588af109941cfbbbffef7' into merge_korg_master

Conflicts:
	docs/porting-guide.html