Merge branch 'master' into libkms-master