Merge branch 'master' into switch-0.9.5

knockout/tests/knockout-tests.ts

@@ -568,4 +568,17 @@ function test_misc() {
     ko.utils.domNodeDisposal.addDisposeCallback(element, function () {
         $(element).datepicker("destroy");
     });
+	
+	this.observableFactory = function(): KnockoutObservable<number>{
+	    if (true) {
+			return ko.computed({
+				read:function(){ 
+					return 3; 
+				}
+			});
+		} else {
+			return ko.observable(3);
+		}
+	}
+	
 }