Merge pull request #3650 from jim-parry/fix/housekeeping

[ci skip] Housekeeping.