Merge from fogfish master