upgrade to upstream version 2013.07