Re #483 - Not planning to commit this yet, but have to to fix an earlier
commit :(