Merge master into idea12