Merge branch 'master' into master

Author: ferraro

src/main/java/io/swagger/codegen/v3/generators/javascript/JavaScriptClientCodegen.java

@@ -29,3 +29,4 @@ io.swagger.codegen.v3.generators.scala.AkkaHttpServerCodegen
 io.swagger.codegen.v3.generators.swift.Swift3Codegen
 io.swagger.codegen.v3.generators.swift.Swift4Codegen
 io.swagger.codegen.v3.generators.typescript.TypeScriptAngularClientCodegen
+io.swagger.codegen.v3.generators.javascript.JavaScriptClientCodegen

src/main/resources/META-INF/services/io.swagger.codegen.v3.CodegenConfig

@@ -78,7 +78,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#interfa
     return {{name}};
   }{{/is}}{{/is}}{{#is this 'enum'}}{{#is this 'map-container'}}public {{{datatypeWithEnum}}} {{#is this 'boolean'}}is{{/is}}{{getter}}() {
     return {{name}};
-  }{{/is}}{{/is}}{{#isNot this 'enum'}}public {{{datatypeWithEnum}}} {{#is this 'boolean'}}is{{/is}}{{getter}}() {
+  }{{/is}}{{/is}}{{#isNot this 'enum'}}public {{{datatypeWithEnum}}} {{getter}}() {
     return {{name}};
   }{{/isNot}}