prep for merge with upstream master