Merged the 5.0 fix to 5.1 and fixed the 5.1 specific warnings.
Attach a file by drag & drop or click to upload
