merge master, widget addThis