Updating trunk on 2013-04-13