Merge svn trunk as of May 10, 2013