1.1.x

Pull the changes into master for next release