Merge Makefile fix from 3.2 (thanks Georg)