merged rake-export-jeff