Merge remote-tracking branch 'origin/master'

Author: aldeed

inputTypes/select-multiple/select-multiple.js

@@ -17,7 +17,7 @@ AutoForm.addInputType("select-multiple", {
             // #each uses to track unique list items when adding and removing them
             // See https://github.com/meteor/meteor/issues/2174
             _id: subOpt.value,
-            selected: _.contains(context.value, opt.value),
+            selected: _.contains(context.value, subOpt.value),
             atts: context.atts
           };
         });
@@ -55,4 +55,4 @@ Template["afSelectMultiple"].helpers({
     }
     return atts;
   }
-});
+});