1.1.x merged into master