Thanks. I will merge this PR manually once you're happy with it - that will avoid the need to rebase for such a trivial conflict.