merge conflicts
merge conflicts

Merge remote-tracking branch 'upstream/master'

Conflicts:
	R/utils-json.R

mhines-usgs/repgen,thongsav-usgs/repgen,USGS-R/repgen,lindsaycarr/repgen,lindsaycarr/repgen,zmoore-usgs/repgen,zmoore-usgs/repgen,mhines-usgs/repgen,dpattermann-usgs/repgen,thongsav-usgs/repgen,USGS-R/repgen,USGS-R/repgen,dpattermann-usgs/repgen,mhines-usgs/repgen,lindsaycarr/repgen,zmoore-usgs/repgen,thongsav-usgs/repgen,dpattermann-usgs/repgen