update upstream-master
Merge branch 'cmv3' of github.com:adobe/brackets into cmv3