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

* V5-5-patches:
  m4/ac_add_search_path.m4: Fix a comment