Ataki/gridfs

@stvstnfrd to review commit
As mentioned above, lets revert these whitespace changes, such that the
commit contains only explicitly introduced functional changes.