Make "make distclean" work again.
(cherry picked from commit 340f91ea56ed6c2fccb07d259c5095aa1d9b019f)
Merge remote-tracking branch 'upstream/3.5.x' into 3.5_surfsara