Merge branch 'master' into fullwidth

Fix meta-Makefile