FileWrapper to be serializable, Closes #705
Merge remote-tracking branch 'origin/master'