Checkpoint commit (untested) of file size limit work (#11).
Merge branch 'master' into issue11-limit-file-size
Finalize file size limit functionality (fixes #11).