Merge fix

Author: amcdnl

test/select.spec.js

@@ -253,7 +253,7 @@ describe('ui-select tests', function() {
     expect(isDropdownOpened(el2)).toEqual(true);
 
     var el3 = createUiSelect();
-    expect(el3.scope().$select.disabled).toBeFalsy();
+    expect(el3.scope().$select.disabled).toEqual(false || undefined);
     clickMatch(el3);
     expect(isDropdownOpened(el3)).toEqual(true);
   });