Fix typo
Merge branch 'master' into hack/with-binary-libraries