merge with original release (2013-05-10)