changes to master from caribou