merge in latest Linton version