Merge branch 'pj/maint-ldflags'