Merge remote-tracking branch 'origin/experimental' into experimental

# Conflicts:
#	src/components/field/FileUpload.js

Author: Jonatan Salas

src/components/field/FileUpload.js

@@ -49,7 +49,8 @@ export default class FileUpload extends Component {
 		files.splice(position, 1);
 
 		this.setState({files: files});
-        this.setState({disableUpload: this.state.files.length == 0});
+        this.setState({disableUpload: files.length == 0});
+
 	};
 
 	openDropZone = () => {