Dev updates for 2013-06-18