am b1de6a4d: Merge "Change already inline error to warning"

* commit 'b1de6a4db50444530a459ad17987c50000eaa53a':
  Change already inline error to warning