am 81cb2d18: Merge "Don\'t replace file extension when mime-type is incorrect"

* commit '81cb2d1800a0a0aced83225f7f923b0809211001':
  Don't replace file extension when mime-type is incorrect