Use new default setting of 10MB.
Merge branch 'master' into gh-pages