Merge branch 'pj/maint-ldflags' into maint