Merge remote-tracking branch 'git-po/maint'