Merge branch 'brackets' into iwehrman/consistent-file-caching