Patches required for SVN-20130401