2013-05-19: Update to SVN-20130515