Incorporated 2013-06-wise git material in to 2013-09-msu branch