2.1.18 beta

#371 - Fix for uploaded files corrupted