Merge commit 'ca152e5eeb74d38e00324b93e22fc70008eca5cf' * commit 'ca152e5eeb74d38e00324b93e22fc70008eca5cf': libcopybit: Fix typo, and the build