[m-rev.] for post-commit review: fix mantis bug 542

[Peter Wang]

On Mon, 24 Jan 2022 22:47:38 +1100 "Zoltan Somogyi" <zoltan.somogyi at runbox.com> wrote:
> For review by anyone.
> 
> The diff I am committing will include some reordering
> of the contents of inlining.m, but I am not including that
> in the diff to make reviewing easier. And I am not committing
> it separately, since if I did, then Julien would have two commits
> to take over to the release branch.

It's trivial with git cherry-pick when the branches are similar.

Peter