Merge branch 'dp/makefile-charset-lib-doc'