Merge from cliffordwolf/master