backport 1.1.0 release to folsom branch