Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/mackenza/brackets
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
fix 9137, 9143
Merge pull request #9149 from adobe/randy/issues-9137-9143

Hide Options button when Working Set hidden
Merge branch 'master' of https://github.com/mackenza/brackets
Merge remote-tracking branch 'upstream/master'