Merge master into 2.1-installer