backport 1.1.1 release to folsom branch