Merge userswidget-mod/master