Pull upstream#3

djoslin0 wants to merge 4 commits intoIsaac0-dev:masterIsaac0-dev/coopnet:masterfrom

djoslin0:masterdjoslin0/coopnet:masterCopy head branch name to clipboard