Merge remote-tracking branch 'upstream/develop' into
jquery-file-upload-blueimp