Merge branch 'info-in-builddir' into maint