Updated in browser at strd6.github.io/editor
Updated in browser at strd6.github.io/editor
Merge master into extract-some-dependencies