Dev Branch Updates for 2013-07-01