Update a comment and a docstring
Removed a sentence in a docstring
Merge branch 'smart-block_size' into fix-site_data
Merge pull request #1188 from gem/smart-block_size

Make the engine smart enough to infer the right block size
Merge branch 'master' into fix-site_data