am 78114220: Merge "Define DEFFILEMODE and friends"

* commit '781142208033e72b3773bcfab83cddf5ca34c9b2':
  Define DEFFILEMODE and friends