Update master

Dev has some updates that should be in master (for our purposes)