Merge branch 'ap/maint-apply-modefix'

* ap/maint-apply-modefix:
  builtin-apply: prevent non-explicit permission changes

diff --cc builtin-apply.c
Simple merge