Merge remote-tracking branch 'origin/v8/dev' into netcore/dev

src/Umbraco.Infrastructure/PropertyEditors/TrueFalsePropertyEditor.cs

@@ -13,7 +13,7 @@ namespace Umbraco.Web.PropertyEditors
     [DataEditor(
         Constants.PropertyEditors.Aliases.Boolean,
         EditorType.PropertyValue | EditorType.MacroParameter,
-        "Checkbox",
+        "Toggle",
         "boolean",
         ValueType = ValueTypes.Integer,
         Group = Constants.PropertyEditors.Groups.Common,

src/Umbraco.Infrastructure/PropertyEditors/UserPickerConfiguration.cs

@@ -7,7 +7,8 @@ namespace Umbraco.Web.PropertyEditors
     {
         public override IDictionary<string, object> DefaultConfiguration => new Dictionary<string, object>
         {
-            {"entityType", "User"}
+            { "entityType", "User" },
+            { "multiPicker", "0" }
         };
     }
 }

src/Umbraco.Infrastructure/PropertyEditors/UserPickerPropertyEditor.cs

@@ -8,8 +8,8 @@ namespace Umbraco.Web.PropertyEditors
 {
     [DataEditor(
         Constants.PropertyEditors.Aliases.UserPicker,
-        "User picker",
-        "entitypicker",
+        "User Picker",
+        "userpicker",
         ValueType = ValueTypes.Integer,
         Group = Constants.PropertyEditors.Groups.People,
         Icon = Constants.Icons.User)]

src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/MemberPickerValueConverter.cs

@@ -31,6 +31,8 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
 
         public override object ConvertSourceToIntermediate(IPublishedElement owner, IPublishedPropertyType propertyType, object source, bool preview)
         {
+            if (source == null) return null;
+
             var attemptConvertInt = source.TryConvertTo<int>();
             if (attemptConvertInt.Success)
                 return attemptConvertInt.Result;