Looks like this one conflicted against https://github.com/adobe/brackets/commit/649655905a21427230ae340a88be6aa6bb9512cb as well