MXE-20 added File member functions that return errors
Merge branch 'bugfixes/tokumx-2.0'