SVN commit 13239 by adridg: Merge r13099 from plasma5/ (except USES has moved, and path in reinplace is different, and other comment doesn't match) M +3 -4 Makefile