Rebased onto ace latest master version

See codio/client#100 for more info.