Merge branch 'test-jest' of ssh://sc07.dev:2424/sc07/canvas into test-jest