Dev Branch updates for 2013-07-03