R1:903f98598364

Test commit for T945

Resolves T945 as fixed. (Also tweaks the regexp slightly.)