Fix bug w/ CKEditor uploader missing due to missing FileUpload plugin
Merge branch 'gh/3.2/develop' into gh/master