merge master to john

didn't merge john prior to this