generic open source
Merge branch 'ephox_master'.

Pulling in sublime plugin improvements.