Merge fixes from 7.x-2.x from wetkit_widgets.make file.