Dev branch commits for 2013-06-15