Merge branch 'br-2' of https://github.com/ekazakov/MarionettePlayground into br-2