Index: branches/5.2.x/core/admin_templates/js/uploader/plupload.dev.js
===================================================================
diff -u -N -r16416 -r16575
--- branches/5.2.x/core/admin_templates/js/uploader/plupload.dev.js	(.../plupload.dev.js)	(revision 16416)
+++ branches/5.2.x/core/admin_templates/js/uploader/plupload.dev.js	(.../plupload.dev.js)	(revision 16575)
@@ -18,6 +18,9 @@
  *
  * License: http://www.plupload.com/license
  * Contributing: http://www.plupload.com/contributing
+ *
+ * Manually applied patches:
+ *  - https://github.com/moxiecode/plupload/commit/82cc0f0221961736a7d493f772ba29e6cbd225b0 (from v2.1.0)
  */
 
 /*global mOxie:true */
@@ -666,6 +669,8 @@
 plupload.addFileFilter('max_file_size', function(maxSize, file, cb) {
 	var undef;
 
+	maxSize = plupload.parseSize(maxSize);
+
 	// Invalid file size
 	if (file.size !== undef && maxSize && file.size > maxSize) {
 		this.trigger('Error', {
@@ -1153,12 +1158,12 @@
 
 			switch (option) {
 				case 'max_file_size':
+					settings.max_file_size = settings.filters.max_file_size = value;
+					break;
+
 				case 'chunk_size':
 					if (value = plupload.parseSize(value)) {
 						settings[option] = value;
-						if (option === 'max_file_size') {
-							settings.max_file_size = settings.filters.max_file_size = value;
-						}
 					}
 					break;