More changes merged from upstream master.  Attempting to bring the number of differences down to a minimum between master and playerWithMaps.