merge branch master into widgets.disabled