merge 'threaded terrain' changelog items