Merged ROOT6 from repository wmtan