Merge pull request #1 from borisyankov/master

Update fork
stack layout out update definition
Merge pull request #2761 from bluong/stackLayoutOffset

Stack layout offset