Merge branch 'master' into rename-repo-url

knockout/knockout.d.ts

@@ -553,7 +553,7 @@ interface KnockoutComputedContext {
 // refactored types into a namespace to reduce global pollution
 // and used Union Types to simplify overloads (requires TypeScript 1.4)
 //
-declare module KnockoutComponentTypes {
+declare namespace KnockoutComponentTypes {
 
     interface Config {
         viewModel?: ViewModelFunction | ViewModelSharedInstance | ViewModelFactoryFunction | AMDModule;

knockout/tests/jasmine.extensions.d.ts

@@ -2,7 +2,7 @@
 // See https://github.com/knockout/knockout/blob/v3.4.0/spec/lib/jasmine.extensions.js
 // FYI jasmine-jquery.d.ts (https://github.com/velesin/jasmine-jquery) also defines toContainHtml() and toContainText()
 
-declare module jasmine {
+declare namespace jasmine {
   interface Matchers {
     toContainHtml(expected: string): boolean;
     toContainText(expected: string): boolean;