Merge branch 'maint-0.4.2' into release-0.4.2

Makefile.am

@@ -370,7 +370,7 @@ endif
 
 check-includes:
 if USEPYTHON
-	$(PYTHON) $(top_srcdir)/scripts/maint/practracker/includes.py
+	$(PYTHON) $(top_srcdir)/scripts/maint/practracker/includes.py $(top_srcdir)
 endif
 
 check-best-practices:

changes/bug31335

@@ -0,0 +1,3 @@
+  o Minor bugfixes (code quality):
+    - Fix "make check-includes" so it runs correctly on out-of-tree builds.
+      Fixes bug 31335; bugfix on 0.3.5.1-alpha.