Merge from plainblack/master