Upgraded to upstream version 2013-11-16