Syncing from Monotone at 20180624-202826. Last commit message was Some very minimal debugger prototype