Merge branch '2.1.x' into 2.2.x

Author: jeffscottbrown

grails-web/src/main/groovy/org/codehaus/groovy/grails/web/binding/GrailsDataBinder.java

@@ -919,8 +919,14 @@ else if (v instanceof String) {
                 }
             }
             else if (GrailsDomainConfigurationUtil.isBasicType(associatedType)) {
-                if (isArray) {
-                    Object[] values = (Object[])v;
+                Object[] values = null;
+                if(isArray) {
+                    values = (Object[])v;
+                } else if(v instanceof String) {
+                    values = new String[]{(String)v};
+                }
+
+                if (values != null) {
                     List list = collection instanceof List ? (List)collection : null;
                     for (int i = 0; i < values.length; i++) {
                         Object value = values[i];
@@ -942,6 +948,7 @@ else if (GrailsDomainConfigurationUtil.isBasicType(associatedType)) {
                             // ignore
                         }
                     }
+                    mpvs.removePropertyValue(pv);
                 }
             }
         }