merge to mastergerge branch 'master' of https://github.com/scaleoutsy…

merge to mastergerge branch 'master' of https://github.com/scaleoutsy… #1613