change #3 parkeys1
Merge branch 'branch3'
change #3 parkeys
Merge branch 'branch3' - parleys

Conflicts:
	CHANGELOG.txt

Merged so that change #3 includes both parkeys and parkeys1.