0f0c826 branch
Merge branch 'kynnjo-master'