6 1 stable

merge 6-1-stable branch to master