Dev branch updates for 2013-06-17