Merge v1.1-dev branch into master