Updated in browser at strd6.github.io/editor
Merge master into rechior-transitional