Dev Branch updates for 2013-06-20