[CLOSED] Merge changes from release branch back to master

[core-ai-bot]

Issue by redmunds
Monday May 12, 2014 at 15:14 GMT
Originally opened as adobe/brackets#7825

---

Mainly want to get ALF changes, but merging all changes so far.

---

redmunds included the following code: https://github.com/adobe/brackets/pull/7825/commits