Merge https://github.com/adobe/brackets.git