Removed NIL
Merge branch 'master' into fmemopen