scope extension yielding block
merge commit from master