am a4ddb549: Merge "Fix a bug in the inliner."

* commit 'a4ddb5493e2426488074cfeccf1b1e779d5385ee':
  Fix a bug in the inliner.