Merge upstream 1.9+ commits into master

[humphd]

In #569 I merged with all the work we've missed on adobe/brackets for the past 2 years (we merged e9399ba). We'll need to do this again at some point. Here is the compare branch to give a sense of what's new that we don't have:

adobe/brackets@e9399ba...master

There's nothing compelling there right now that I can see in terms of what we're doing.

[humphd]

When we do this, we'll have to deal with this change as one of the breaking changes upstream: adobe#11948