Resolved conflicts after rebasing

Author: ppham27

src/lib/select/select.spec.ts

@@ -57,7 +57,7 @@ describe('MdSelect', () => {
         BasicSelectNoPlaceholder,
         BasicSelectWithTheming,
         ResetValuesSelect,
-        FalsyValueSelect
+        FalsyValueSelect,
         NgModelCompareWithSelect,
       ],
       providers: [

src/lib/select/select.ts

@@ -620,7 +620,8 @@ export class MdSelect implements AfterContentInit, OnDestroy, OnInit, ControlVal
           }
           return false;
         }
-      }) : optionsArray.find(option => option.value === value);
+      }) : optionsArray.find(
+        option => option.value !== null && option.value === value);
 
     if (correspondingOption) {
       correspondingOption.select();