old master now renamed to 1.x
merge