Pull in updates to this repo from the last two months or so