Syncing from Monotone at 20200213-150342. Last commit message was More or less import classname logic