Makefile: one more tweak
Merge branch 'master' into crypto