merged-into-07-hubbe-981231
543b8831 · Merge 'heads/0.6': fixes for NT ·