OS X doesn't like writing more than 2^31
Merge branch 'master' into bounded