Fixes for issues #33 and #34
Merge remote-tracking branch 'upstream/sublime-text-3' into sublime-text-3