Merging in blobstore-builder (PR #536)
Minor: file mode fixed.