CJ-966

porting https://github.com/code-orchestra/colt-sublime-plugin/commit/b70659902eba02080c0818a3438715712470c8aa