merge master into stable/icehouse