Merge branch 'V5-6-patches' into V5-7-patches

* V5-6-patches:
  testing/Makefile.in: make sure '$' survives for perl test.