am 09fbde3b: Merge "Allow nested inlining."

* commit '09fbde3b2b4cad32059b0fd36524c11a808b2885':
  Allow nested inlining.