Updating trunk on 2013-01-18