merged weskinner/master