Merge branch 'master' into blake2

66a24c9c00Marc Tiehuis committed on 1/16/2018, 11:20:06 AMparentsfa7b33592fc594
50 files changedLine totals unavailable