2013.1.beta.5

merge 2013.1.beta.5 branch into master