merge 4.0.0 into master

diff --cc Xamarin.Forms.Material.Android/MaterialEditorRenderer.cs
index d2f3bc3,b7f05f5..b76ae1f
--- 1/Xamarin.Forms.Material.Android/MaterialEditorRenderer.cs
--- 2/Xamarin.Forms.Material.Android/MaterialEditorRenderer.cs
+++ b/Xamarin.Forms.Material.Android/MaterialEditorRenderer.cs
@@@ -28,8 -27,6 +28,7 @@@ namespace Xamarin.Forms.Material.Androi
                        var view = inflater.Inflate(Resource.Layout.TextInputLayoutFilledBox, null);
                        _textInputLayout = (MaterialFormsTextInputLayout)view;
                        _textInputEditText = _textInputLayout.FindViewById<MaterialFormsEditText>(Resource.Id.materialformsedittext);
-                       UpdatePlaceholderText();
 +                      _textInputEditText.ImeOptions = ImeAction.Done;
  
                        return _textInputLayout;
                }

diff --cc Xamarin.Forms.Platform.iOS/Renderers/ImageRenderer.cs
Simple merge

diff --cc Xamarin.Forms.Xaml/XamlParser.cs
Simple merge