Scssphp children to master master

fixed merge conflict for 1.1.x -> master