Merge remote-tracking branch 'forked/networkhashps' into mac