Merge with kangax master