merge 1.1.x into master