2013-05-15: Update to SVN-20130514