2013.1.beta.6 merge

Merge 2013.1.beta.6 into master - prep for branching beta 7