2013-05-10: Update to SVN-20130504