diff --git a/.travis.yml b/.travis.yml
index 4fde780ff2..28ddaab619 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,6 @@ os:
   - osx
   - linux
 
-
 install:
 - ./tool/install_travis.sh
 
diff --git a/lib/src/dartdoc_options.dart b/lib/src/dartdoc_options.dart
index 1a2eac9b0d..54cacdf585 100644
--- a/lib/src/dartdoc_options.dart
+++ b/lib/src/dartdoc_options.dart
@@ -376,7 +376,9 @@ abstract class DartdocOption<T> {
     } else if (valueWithContext.value is Map<String, String>) {
       resolvedPaths = valueWithContext.resolvedValue.values.toList();
     } else {
-      assert(false, "Trying to ensure existence of unsupported type "
+      assert(
+          false,
+          "Trying to ensure existence of unsupported type "
           "${valueWithContext.value.runtimeType}");
     }
     for (String path in resolvedPaths) {
diff --git a/lib/src/html/html_generator_instance.dart b/lib/src/html/html_generator_instance.dart
index 7d1a2b3b2e..134fe5adcd 100644
--- a/lib/src/html/html_generator_instance.dart
+++ b/lib/src/html/html_generator_instance.dart
@@ -169,6 +169,44 @@ class HtmlGeneratorInstance {
           }
         }
 
+        for (var mixin in filterNonDocumented(lib.mixins)) {
+          generateMixins(_packageGraph, lib, mixin);
+          for (var constructor in filterNonDocumented(mixin.constructors)) {
+            if (!constructor.isCanonical) continue;
+            generateConstructor(_packageGraph, lib, mixin, constructor);
+          }
+
+          for (var constant in filterNonDocumented(mixin.constants)) {
+            if (!constant.isCanonical) continue;
+            generateConstant(_packageGraph, lib, mixin, constant);
+          }
+
+          for (var property in filterNonDocumented(mixin.staticProperties)) {
+            if (!property.isCanonical) continue;
+            generateProperty(_packageGraph, lib, mixin, property);
+          }
+
+          for (var property in filterNonDocumented(mixin.propertiesForPages)) {
+            if (!property.isCanonical) continue;
+            generateProperty(_packageGraph, lib, mixin, property);
+          }
+
+          for (var method in filterNonDocumented(mixin.methodsForPages)) {
+            if (!method.isCanonical) continue;
+            generateMethod(_packageGraph, lib, mixin, method);
+          }
+
+          for (var operator in filterNonDocumented(mixin.operatorsForPages)) {
+            if (!operator.isCanonical) continue;
+            generateMethod(_packageGraph, lib, mixin, operator);
+          }
+
+          for (var method in filterNonDocumented(mixin.staticMethods)) {
+            if (!method.isCanonical) continue;
+            generateMethod(_packageGraph, lib, mixin, method);
+          }
+        }
+
         for (var eNum in filterNonDocumented(lib.enums)) {
           generateEnum(_packageGraph, lib, eNum);
           for (var property in filterNonDocumented(eNum.propertiesForPages)) {
@@ -239,6 +277,13 @@ class HtmlGeneratorInstance {
         pathLib.joinAll(clazz.href.split('/')), _templates.classTemplate, data);
   }
 
+  void generateMixins(PackageGraph packageGraph, Library lib, Mixin mixin) {
+    TemplateData data =
+        new MixinTemplateData(_options, packageGraph, lib, mixin);
+    _build(
+        pathLib.joinAll(mixin.href.split('/')), _templates.mixinTemplate, data);
+  }
+
   void generateConstructor(PackageGraph packageGraph, Library lib, Class clazz,
       Constructor constructor) {
     TemplateData data = new ConstructorTemplateData(
diff --git a/lib/src/html/template_data.dart b/lib/src/html/template_data.dart
index 6c7a8491b5..ced3611cc8 100644
--- a/lib/src/html/template_data.dart
+++ b/lib/src/html/template_data.dart
@@ -209,7 +209,20 @@ class LibraryTemplateData extends TemplateData<Library> {
   Library get self => library;
 }
 
-class ClassTemplateData extends TemplateData<Class> {
+/// Template data for Dart 2.1-style mixin declarations.
+class MixinTemplateData extends ClassTemplateData<Mixin> {
+  final Mixin mixin;
+
+  MixinTemplateData(HtmlOptions htmlOptions, PackageGraph packageGraph,
+      Library library, this.mixin)
+      : super(htmlOptions, packageGraph, library, mixin);
+
+  @override
+  Mixin get self => mixin;
+}
+
+/// Base template data class for [Class], [Enum], and [Mixin].
+class ClassTemplateData<T extends Class> extends TemplateData<T> {
   final Class clazz;
   final Library library;
   Class _objectType;
@@ -219,7 +232,7 @@ class ClassTemplateData extends TemplateData<Class> {
       : super(htmlOptions, packageGraph);
 
   @override
-  Class get self => clazz;
+  T get self => clazz;
   String get linkedObjectType =>
       objectType == null ? 'Object' : objectType.linkedName;
   @override
@@ -303,28 +316,15 @@ class ConstructorTemplateData extends TemplateData<Constructor> {
       'for the Dart programming language.';
 }
 
-class EnumTemplateData extends TemplateData<Enum> {
+class EnumTemplateData extends ClassTemplateData<Enum> {
   EnumTemplateData(HtmlOptions htmlOptions, PackageGraph packageGraph,
-      this.library, this.eNum)
-      : super(htmlOptions, packageGraph);
+      Library library, Enum eNum)
+      : super(htmlOptions, packageGraph, library, eNum);
 
-  final Library library;
-  final Enum eNum;
+  Enum get eNum => clazz;
   @override
   Enum get self => eNum;
   @override
-  String get layoutTitle => _layoutTitle(eNum.name, 'enum', eNum.isDeprecated);
-  @override
-  String get title => '${self.name} enum - ${library.name} library - Dart API';
-  @override
-  String get metaDescription =>
-      'API docs for the ${eNum.name} enum from the ${library.name} library, '
-      'for the Dart programming language.';
-  @override
-  List get navLinks => [packageGraph.defaultPackage, library];
-  @override
-  String get htmlBase => '..';
-  @override
   Iterable<Subnav> getSubNavItems() => [
         new Subnav('Constants', '${eNum.href}#constants'),
         new Subnav('Properties', '${eNum.href}#instance-properties'),
diff --git a/lib/src/html/templates.dart b/lib/src/html/templates.dart
index b6627edd75..138494b2a3 100644
--- a/lib/src/html/templates.dart
+++ b/lib/src/html/templates.dart
@@ -19,6 +19,7 @@ const _partials = const <String>[
   'footer',
   'head',
   'library',
+  'mixin',
   'packages',
   'property',
   'features',
@@ -91,6 +92,7 @@ class Templates {
   final TemplateRenderer indexTemplate;
   final TemplateRenderer libraryTemplate;
   final TemplateRenderer methodTemplate;
+  final TemplateRenderer mixinTemplate;
   final TemplateRenderer propertyTemplate;
   final TemplateRenderer topLevelConstantTemplate;
   final TemplateRenderer topLevelPropertyTemplate;
@@ -132,6 +134,7 @@ class Templates {
     var topLevelPropertyTemplate =
         await _loadTemplate('top_level_property.html');
     var typeDefTemplate = await _loadTemplate('typedef.html');
+    var mixinTemplate = await _loadTemplate('mixin.html');
 
     return new Templates._(
         indexTemplate,
@@ -147,7 +150,8 @@ class Templates {
         constantTemplate,
         topLevelConstantTemplate,
         topLevelPropertyTemplate,
-        typeDefTemplate);
+        typeDefTemplate,
+        mixinTemplate);
   }
 
   Templates._(
@@ -164,5 +168,6 @@ class Templates {
       this.constantTemplate,
       this.topLevelConstantTemplate,
       this.topLevelPropertyTemplate,
-      this.typeDefTemplate);
+      this.typeDefTemplate,
+      this.mixinTemplate);
 }
diff --git a/lib/src/markdown_processor.dart b/lib/src/markdown_processor.dart
index f108cc9060..0d20fc6674 100644
--- a/lib/src/markdown_processor.dart
+++ b/lib/src/markdown_processor.dart
@@ -185,66 +185,9 @@ ModelElement _getPreferredClass(ModelElement modelElement) {
   return null;
 }
 
-// TODO: this is in the wrong place
-NodeList<CommentReference> _getCommentRefs(Documentable documentable) {
-  // Documentable items that aren't related to analyzer elements have no
-  // CommentReference list.
-  if (documentable is! ModelElement) return null;
-  ModelElement modelElement = documentable;
-
-  if (modelElement.element.documentationComment == null &&
-      modelElement.canOverride()) {
-    var node = modelElement.overriddenElement?.element?.computeNode();
-    if (node is AnnotatedNode) {
-      if (node.documentationComment != null) {
-        return node.documentationComment.references;
-      }
-    }
-  }
-
-  if (modelElement.element.computeNode() is AnnotatedNode) {
-    final AnnotatedNode annotatedNode = modelElement.element.computeNode();
-    if (annotatedNode.documentationComment != null) {
-      return annotatedNode.documentationComment.references;
-    }
-  } else if (modelElement.element is LibraryElement) {
-    // handle anonymous libraries
-    if (modelElement.element.computeNode() == null ||
-        modelElement.element.computeNode().parent == null) {
-      return null;
-    }
-    var node = modelElement.element.computeNode().parent.parent;
-    if (node is AnnotatedNode) {
-      if (node.documentationComment != null) {
-        return node.documentationComment.references;
-      }
-    }
-  }
-
-  // Our references might come from somewhere up in the inheritance chain.
-  // TODO(jcollins-g): rationalize this and all other places where docs are
-  //                   inherited to be consistent.
-  if (modelElement.element is ClassMemberElement) {
-    var node = modelElement.element
-        .getAncestor((e) => e is ClassElement)
-        .computeNode();
-    if (node is AnnotatedNode) {
-      if (node.documentationComment != null) {
-        return node.documentationComment.references;
-      }
-    }
-  }
-  return null;
-}
-
 /// Returns null if element is a parameter.
 MatchingLinkResult _getMatchingLinkElement(
     String codeRef, Warnable element, List<CommentReference> commentRefs) {
-  // By debugging inspection, it seems correct to not warn when we don't have
-  // CommentReferences; there's actually nothing that needs resolving in
-  // that case.
-  if (commentRefs == null) return new MatchingLinkResult(null, warn: false);
-
   if (!codeRef.contains(isConstructor) &&
       codeRef.contains(notARealDocReference)) {
     // Don't waste our time on things we won't ever find.
@@ -254,7 +197,7 @@ MatchingLinkResult _getMatchingLinkElement(
   ModelElement refModelElement;
 
   // Try expensive not-scoped lookup.
-  if (refModelElement == null) {
+  if (refModelElement == null && element is ModelElement) {
     Class preferredClass = _getPreferredClass(element);
     refModelElement =
         _findRefElementInLibrary(codeRef, element, commentRefs, preferredClass);
@@ -318,22 +261,25 @@ MatchingLinkResult _getMatchingLinkElement(
 /// Given a set of commentRefs, return the one whose name matches the codeRef.
 Element _getRefElementFromCommentRefs(
     List<CommentReference> commentRefs, String codeRef) {
-  for (CommentReference ref in commentRefs) {
-    if (ref.identifier.name == codeRef) {
-      bool isConstrElement = ref.identifier.staticElement is ConstructorElement;
-      // Constructors are now handled by library search.
-      if (!isConstrElement) {
-        Element refElement = ref.identifier.staticElement;
-        if (refElement is PropertyAccessorElement) {
-          // yay we found an accessor that wraps a const, but we really
-          // want the top-level field itself
-          refElement = (refElement as PropertyAccessorElement).variable;
-        }
-        if (refElement is PrefixElement) {
-          // We found a prefix element, but what we really want is the library element.
-          refElement = (refElement as PrefixElement).enclosingElement;
+  if (commentRefs != null) {
+    for (CommentReference ref in commentRefs) {
+      if (ref.identifier.name == codeRef) {
+        bool isConstrElement =
+            ref.identifier.staticElement is ConstructorElement;
+        // Constructors are now handled by library search.
+        if (!isConstrElement) {
+          Element refElement = ref.identifier.staticElement;
+          if (refElement is PropertyAccessorElement) {
+            // yay we found an accessor that wraps a const, but we really
+            // want the top-level field itself
+            refElement = (refElement as PropertyAccessorElement).variable;
+          }
+          if (refElement is PrefixElement) {
+            // We found a prefix element, but what we really want is the library element.
+            refElement = (refElement as PrefixElement).enclosingElement;
+          }
+          return refElement;
         }
-        return refElement;
       }
     }
   }
@@ -719,7 +665,7 @@ void _getResultsForClass(Class tryClass, String codeRefChomped,
 }
 
 String _linkDocReference(
-    String codeRef, Warnable warnable, NodeList<CommentReference> commentRefs) {
+    String codeRef, Warnable warnable, List<CommentReference> commentRefs) {
   MatchingLinkResult result;
   result = _getMatchingLinkElement(codeRef, warnable, commentRefs);
   final ModelElement linkedElement = result.element;
@@ -942,11 +888,7 @@ class Documentation {
     return _asOneLiner;
   }
 
-  NodeList<CommentReference> _commentRefs;
-  NodeList<CommentReference> get commentRefs {
-    if (_commentRefs == null) _commentRefs = _getCommentRefs(_element);
-    return _commentRefs;
-  }
+  List<CommentReference> get commentRefs => _element.commentRefs;
 
   void _renderHtmlForDartdoc(bool processAllDocs) {
     Tuple3<String, String, bool> renderResults =
diff --git a/lib/src/model.dart b/lib/src/model.dart
index 649400434f..83f385f8ab 100644
--- a/lib/src/model.dart
+++ b/lib/src/model.dart
@@ -286,20 +286,19 @@ class Accessor extends ModelElement implements EnclosedElement {
 
   @override
   String get sourceCode {
-    if (_sourceCodeCache == null) {
+    if (_sourceCode == null) {
       if (isSynthetic) {
-        _sourceCodeCache =
+        _sourceCode =
             sourceCodeFor((element as PropertyAccessorElement).variable);
       } else {
-        _sourceCodeCache = super.sourceCode;
+        _sourceCode = super.sourceCode;
       }
     }
-    return _sourceCodeCache;
+    return _sourceCode;
   }
 
   @override
   List<ModelElement> get computeDocumentationFrom {
-    if (isSynthetic) return [this];
     return super.computeDocumentationFrom;
   }
 
@@ -417,6 +416,62 @@ class Accessor extends ModelElement implements EnclosedElement {
   PropertyAccessorElement get _accessor => (element as PropertyAccessorElement);
 }
 
+/// Implements the Dart 2.1 "mixin" style of mixin declarations.
+class Mixin extends Class {
+  Mixin(MixinElementImpl element, Library library, PackageGraph packageGraph)
+      : super(element, library, packageGraph) {}
+
+  @override
+  bool get isAbstract => false;
+
+  @override
+  List<Class> get inheritanceChain {
+    if (_inheritanceChain == null) {
+      _inheritanceChain = [];
+      _inheritanceChain.add(this);
+
+      // Mix-in interfaces come before other interfaces.
+      _inheritanceChain.addAll(superclassConstraints.expand(
+          (ParameterizedElementType i) =>
+              (i.element as Class).inheritanceChain));
+
+      // Interfaces need to come last, because classes in the superChain might
+      // implement them even when they aren't mentioned.
+      _inheritanceChain.addAll(
+          interfaces.expand((e) => (e.element as Class).inheritanceChain));
+    }
+    return _inheritanceChain.toList(growable: false);
+  }
+
+  List<ParameterizedElementType> _superclassConstraints;
+
+  /// Returns a list of superclass constraints for this mixin.
+  Iterable<ParameterizedElementType> get superclassConstraints {
+    if (_superclassConstraints == null) {
+      _superclassConstraints = (element as MixinElementImpl)
+          .superclassConstraints
+          .map<ParameterizedElementType>(
+              (InterfaceType i) => new ElementType.from(i, packageGraph))
+          .toList();
+    }
+    return _superclassConstraints;
+  }
+
+  bool get hasPublicSuperclassConstraints =>
+      publicSuperclassConstraints.isNotEmpty;
+  Iterable<ParameterizedElementType> get publicSuperclassConstraints =>
+      filterNonPublic(superclassConstraints);
+
+  @override
+  bool get hasModifiers => super.hasModifiers || hasPublicSuperclassConstraints;
+
+  @override
+  String get fileName => "${name}-mixin.html";
+
+  @override
+  String get kind => 'mixin';
+}
+
 class Class extends ModelElement
     with TypeParameters, Categorization
     implements EnclosedElement {
@@ -907,10 +962,21 @@ class Class extends ModelElement
 
   List<DefinedElementType> get superChain {
     List<DefinedElementType> typeChain = [];
-    var parent = _supertype;
+    DefinedElementType parent = _supertype;
     while (parent != null) {
       typeChain.add(parent);
-      parent = (parent.element as Class)._supertype;
+      if (parent.type is InterfaceType) {
+        // Avoid adding [Object] to the superChain (_supertype already has this
+        // check)
+        if ((parent.type as InterfaceType)?.superclass?.superclass == null) {
+          parent = null;
+        } else {
+          parent = new ElementType.from(
+              (parent.type as InterfaceType).superclass, packageGraph);
+        }
+      } else {
+        parent = (parent.element as Class)._supertype;
+      }
     }
     return typeChain;
   }
@@ -1305,6 +1371,9 @@ abstract class Canonicalization extends Object
   bool get isCanonical;
   Library get canonicalLibrary;
 
+  List<CommentReference> _commentRefs;
+  List<CommentReference> get commentRefs => _commentRefs;
+
   /// Pieces of the location split by [locationSplitter] (removing package: and
   /// slashes).
   Set<String> get locationPieces;
@@ -1495,6 +1564,7 @@ class Field extends ModelElement
   Field(FieldElement element, Library library, PackageGraph packageGraph,
       this.getter, this.setter)
       : super(element, library, packageGraph, null) {
+    assert(getter != null || setter != null);
     if (getter != null) getter.enclosingCombo = this;
     if (setter != null) setter.enclosingCombo = this;
     _setModelType();
@@ -1610,7 +1680,7 @@ class Field extends ModelElement
 
   @override
   String get sourceCode {
-    if (_sourceCodeCache == null) {
+    if (_sourceCode == null) {
       // We could use a set to figure the dupes out, but that would lose ordering.
       String fieldSourceCode = sourceCodeFor(element) ?? '';
       String getterSourceCode = getter?.sourceCode ?? '';
@@ -1629,9 +1699,9 @@ class Field extends ModelElement
       if (fieldSourceCode != setterSourceCode) {
         buffer.write(setterSourceCode);
       }
-      _sourceCodeCache = buffer.toString();
+      _sourceCode = buffer.toString();
     }
-    return _sourceCodeCache;
+    return _sourceCode;
   }
 
   void _setModelType() {
@@ -1724,9 +1794,12 @@ abstract class GetterSetterCombo implements ModelElement {
     return _documentationFrom;
   }
 
-  bool get hasAccessorsWithDocs =>
-      (hasPublicGetter && getter.documentation.isNotEmpty ||
-          hasPublicSetter && setter.documentation.isNotEmpty);
+  bool get hasAccessorsWithDocs => (hasPublicGetter &&
+          !getter.isSynthetic &&
+          getter.documentation.isNotEmpty ||
+      hasPublicSetter &&
+          !setter.isSynthetic &&
+          setter.documentation.isNotEmpty);
   bool get getterSetterBothAvailable => (hasPublicGetter &&
       getter.documentation.isNotEmpty &&
       hasPublicSetter &&
@@ -1736,7 +1809,7 @@ abstract class GetterSetterCombo implements ModelElement {
   String get oneLineDoc {
     if (_oneLineDoc == null) {
       if (!hasAccessorsWithDocs) {
-        _oneLineDoc = _documentation.asOneLiner;
+        _oneLineDoc = computeOneLineDoc();
       } else {
         StringBuffer buffer = new StringBuffer();
         if (hasPublicGetter && getter.oneLineDoc.isNotEmpty) {
@@ -2057,6 +2130,19 @@ class Library extends ModelElement with Categorization, TopLevelContainer {
     return _enums;
   }
 
+  @override
+  List<Mixin> get mixins {
+    if (_mixins != null) return _mixins;
+    List<MixinElementImpl> mixinClasses = [];
+    mixinClasses.addAll(
+        _exportedNamespace.definedNames.values.whereType<MixinElementImpl>());
+    _mixins = mixinClasses
+        .map((e) => new ModelElement.from(e, this, packageGraph) as Mixin)
+        .toList(growable: false)
+          ..sort(byName);
+    return _mixins;
+  }
+
   @override
   List<Class> get exceptions {
     return _allClasses
@@ -2198,7 +2284,7 @@ class Library extends ModelElement with Categorization, TopLevelContainer {
     }
 
     types.addAll(_exportedNamespace.definedNames.values
-        .where((e) => e is ClassElement)
+        .where((e) => e is ClassElement && e is! MixinElementImpl)
         .cast<ClassElement>()
         .where((element) => !element.isEnum));
 
@@ -2342,6 +2428,7 @@ class Library extends ModelElement with Categorization, TopLevelContainer {
         ..addAll(library.constants)
         ..addAll(library.enums)
         ..addAll(library.functions)
+        ..addAll(library.mixins)
         ..addAll(library.properties)
         ..addAll(library.typedefs);
 
@@ -2625,7 +2712,15 @@ abstract class ModelElement extends Canonicalization
 
   factory ModelElement.fromElement(Element e, PackageGraph p) {
     Library lib = _findOrCreateEnclosingLibraryForStatic(e, p);
-    return new ModelElement.from(e, lib, p);
+    Accessor getter;
+    Accessor setter;
+    if (e is PropertyInducingElement) {
+      getter =
+          e.getter != null ? new ModelElement.from(e.getter, lib, p) : null;
+      setter =
+          e.setter != null ? new ModelElement.from(e.setter, lib, p) : null;
+    }
+    return new ModelElement.from(e, lib, p, getter: getter, setter: setter);
   }
 
   // TODO(jcollins-g): this way of using the optional parameter is messy,
@@ -2680,10 +2775,12 @@ abstract class ModelElement extends Canonicalization
         }
         // Also handles enums
         if (e is ClassElement) {
-          if (!e.isEnum) {
-            newModelElement = new Class(e, library, packageGraph);
-          } else {
+          if (e.isMixin) {
+            newModelElement = new Mixin(e, library, packageGraph);
+          } else if (e.isEnum) {
             newModelElement = new Enum(e, library, packageGraph);
+          } else {
+            newModelElement = new Class(e, library, packageGraph);
           }
         }
         if (e is FunctionElement) {
@@ -2815,8 +2912,12 @@ abstract class ModelElement extends Canonicalization
         .packageGraph.libraryElementReexportedBy[this.element.library];
   }
 
-  // TODO(jcollins-g): annotations should now be able to use the utility
-  // functions in package for finding elements and avoid using computeNode().
+  AstNode _astNode;
+  AstNode get astNode {
+    _astNode ??= element?.computeNode();
+    return _astNode;
+  }
+
   List<String> get annotations => annotationsFromMetadata(element.metadata);
 
   /// Returns linked annotations from a given metadata set, with escaping.
@@ -2884,6 +2985,27 @@ abstract class ModelElement extends Canonicalization
     return _isPublic;
   }
 
+  @override
+  List<CommentReference> get commentRefs {
+    if (_commentRefs == null) {
+      _commentRefs = [];
+      for (ModelElement from in documentationFrom) {
+        List<ModelElement> checkReferences = [from];
+        if (from is Accessor) {
+          checkReferences.add(from.enclosingCombo);
+        }
+        for (ModelElement e in checkReferences) {
+          AstNode node = e.astNode;
+          if (node is AnnotatedNode &&
+              node?.documentationComment?.references != null) {
+            _commentRefs.addAll(node.documentationComment.references);
+          }
+        }
+      }
+    }
+    return _commentRefs;
+  }
+
   DartdocOptionContext _config;
   @override
   DartdocOptionContext get config {
@@ -2961,10 +3083,11 @@ abstract class ModelElement extends Canonicalization
   /// for this element.
   List<ModelElement> get computeDocumentationFrom {
     List<ModelElement> docFrom;
+
     if (computeDocumentationComment == null &&
         canOverride() &&
         overriddenElement != null) {
-      docFrom = [overriddenElement];
+      docFrom = overriddenElement.documentationFrom;
     } else if (this is Inheritable && (this as Inheritable).isInherited) {
       Inheritable thisInheritable = (this as Inheritable);
       Class definingEnclosingClass =
@@ -3314,12 +3437,15 @@ abstract class ModelElement extends Canonicalization
   @override
   String get name => element.name;
 
+  // TODO(jcollins-g): refactor once dartdoc will only run in a VM where mixins
+  // calling super is allowed (SDK constraint >= 2.1.0).
+  String computeOneLineDoc() =>
+      '${_documentation.asOneLiner}${extendedDocLink.isEmpty ? "" : " $extendedDocLink"}';
   String _oneLineDoc;
   @override
   String get oneLineDoc {
     if (_oneLineDoc == null) {
-      _oneLineDoc =
-          '${_documentation.asOneLiner}${extendedDocLink.isEmpty ? "" : " $extendedDocLink"}';
+      _oneLineDoc = computeOneLineDoc();
     }
     return _oneLineDoc;
   }
@@ -3452,7 +3578,12 @@ abstract class ModelElement extends Canonicalization
       });
     }
     if (paramModelType is CallableElementTypeMixin) {
-      var returnTypeName = paramModelType.createLinkedReturnTypeName();
+      String returnTypeName;
+      if (paramModelType.isTypedef) {
+        returnTypeName = paramModelType.linkedName;
+      } else {
+        returnTypeName = paramModelType.createLinkedReturnTypeName();
+      }
       buf.write('<span class="type-annotation">${returnTypeName}</span>');
       if (showNames) {
         buf.write(' <span class="parameter-name">${param.name}</span>');
@@ -3990,8 +4121,7 @@ abstract class ModelElement extends Canonicalization
   /// normally with [argParser] and returns the result.
   ArgResults _parseArgs(
       String argsAsString, ArgParser argParser, String directiveName) {
-    var args =
-        _splitUpQuotedArgs(argsAsString, convertToArgs: true);
+    var args = _splitUpQuotedArgs(argsAsString, convertToArgs: true);
     try {
       return argParser.parse(args);
     } on ArgParserException catch (e) {
@@ -5024,6 +5154,7 @@ class PackageGraph {
 abstract class TopLevelContainer extends Nameable {
   List<Class> _classes;
   List<Enum> _enums;
+  List<Mixin> _mixins;
   List<Class> _exceptions;
   List<TopLevelVariable> _constants;
   List<TopLevelVariable> _properties;
@@ -5032,6 +5163,7 @@ abstract class TopLevelContainer extends Nameable {
 
   Iterable<Class> get classes => _classes;
   Iterable<Enum> get enums => _enums;
+  Iterable<Mixin> get mixins => _mixins;
   Iterable<Class> get exceptions => _exceptions;
   Iterable<TopLevelVariable> get constants => _constants;
   Iterable<TopLevelVariable> get properties => _properties;
@@ -5043,14 +5175,16 @@ abstract class TopLevelContainer extends Nameable {
   bool get hasPublicEnums => publicEnums.isNotEmpty;
   bool get hasPublicExceptions => publicExceptions.isNotEmpty;
   bool get hasPublicFunctions => publicFunctions.isNotEmpty;
+  bool get hasPublicMixins => publicMixins.isNotEmpty;
   bool get hasPublicProperties => publicProperties.isNotEmpty;
   bool get hasPublicTypedefs => publicTypedefs.isNotEmpty;
 
   Iterable<Class> get publicClasses => filterNonPublic(classes);
   Iterable<TopLevelVariable> get publicConstants => filterNonPublic(constants);
-  Iterable<Class> get publicEnums => filterNonPublic(enums);
+  Iterable<Enum> get publicEnums => filterNonPublic(enums);
   Iterable<Class> get publicExceptions => filterNonPublic(exceptions);
   Iterable<ModelFunction> get publicFunctions => filterNonPublic(functions);
+  Iterable<Mixin> get publicMixins => filterNonPublic(mixins);
   Iterable<TopLevelVariable> get publicProperties =>
       filterNonPublic(properties);
   Iterable<Typedef> get publicTypedefs => filterNonPublic(typedefs);
@@ -5181,6 +5315,7 @@ class Category extends Nameable
     _constants = [];
     _properties = [];
     _functions = [];
+    _mixins = [];
     _typedefs = [];
   }
 
@@ -5189,6 +5324,8 @@ class Category extends Nameable
     _allItems.add(c);
     if (c is Library) {
       _libraries.add(c);
+    } else if (c is Mixin) {
+      _mixins.add(c);
     } else if (c is Enum) {
       _enums.add(c);
     } else if (c is Class) {
@@ -5660,7 +5797,6 @@ class Parameter extends ModelElement implements EnclosedElement {
 }
 
 abstract class SourceCodeMixin implements Documentable {
-  String _sourceCodeCache;
   String get crossdartHtmlTag {
     if (config.addCrossdart && _crossdartUrl != null) {
       return "<a class='crossdart' href='${_crossdartUrl}'>Link to Crossdart</a>";
@@ -5710,11 +5846,12 @@ abstract class SourceCodeMixin implements Documentable {
     }
   }
 
+  String _sourceCode;
   String get sourceCode {
-    if (_sourceCodeCache == null) {
-      _sourceCodeCache = sourceCodeFor(element);
+    if (_sourceCode == null) {
+      _sourceCode = sourceCodeFor(element);
     }
-    return _sourceCodeCache;
+    return _sourceCode;
   }
 
   String get _crossdartPath {
diff --git a/lib/templates/_mixin.html b/lib/templates/_mixin.html
new file mode 100644
index 0000000000..883309d075
--- /dev/null
+++ b/lib/templates/_mixin.html
@@ -0,0 +1,6 @@
+<dt id="{{htmlId}}">
+  <span class="name {{#isDeprecated}}deprecated{{/isDeprecated}}">{{{linkedName}}}{{{linkedGenericParameters}}}</span> {{>categorization}}
+</dt>
+<dd>
+  {{{ oneLineDoc }}}
+</dd>
diff --git a/lib/templates/_sidebar_for_category.html b/lib/templates/_sidebar_for_category.html
index 4be63996ab..3ba54d1bd4 100644
--- a/lib/templates/_sidebar_for_category.html
+++ b/lib/templates/_sidebar_for_category.html
@@ -6,6 +6,13 @@
   {{/self.publicLibraries}}
   {{/self.hasPublicLibraries}}
 
+  {{#self.hasPublicMixins}}
+  <li class="section-title"><a href="{{library.href}}#mixins">Mixins</a></li>
+  {{#self.publicMixins}}
+  <li>{{{ linkedName }}}</li>
+  {{/self.publicMixins}}
+  {{/self.hasPublicMixins}}
+
   {{#self.hasPublicClasses}}
   <li class="section-title"><a href="{{self.href}}#classes">Classes</a></li>
   {{#self.publicClasses}}
diff --git a/lib/templates/_sidebar_for_library.html b/lib/templates/_sidebar_for_library.html
index c9eea573fe..04d15c3d47 100644
--- a/lib/templates/_sidebar_for_library.html
+++ b/lib/templates/_sidebar_for_library.html
@@ -6,6 +6,13 @@
   {{/library.publicClasses}}
   {{/library.hasPublicClasses}}
 
+  {{#library.hasPublicMixins}}
+  <li class="section-title"><a href="{{library.href}}#mixins">Mixins</a></li>
+  {{#library.publicMixins}}
+  <li>{{{ linkedName }}}</li>
+  {{/library.publicMixins}}
+  {{/library.hasPublicMixins}}
+
   {{#library.hasPublicConstants}}
   <li class="section-title"><a href="{{library.href}}#constants">Constants</a></li>
   {{#library.publicConstants}}
diff --git a/lib/templates/category.html b/lib/templates/category.html
index 69a6ccf6f1..a29ce66dd7 100644
--- a/lib/templates/category.html
+++ b/lib/templates/category.html
@@ -34,6 +34,18 @@ <h2>Classes</h2>
       </section>
       {{/hasPublicClasses}}
 
+      {{#hasPublicMixins}}
+      <section class="summary offset-anchor" id="mixins">
+        <h2>Mixins</h2>
+
+        <dl>
+          {{#publicMixins}}
+          {{>mixin}}
+          {{/publicMixins}}
+        </dl>
+      </section>
+      {{/hasPublicMixins}}
+
       {{#hasPublicConstants}}
       <section class="summary offset-anchor" id="constants">
         <h2>Constants</h2>
diff --git a/lib/templates/library.html b/lib/templates/library.html
index de8b414f95..d78e758cf8 100644
--- a/lib/templates/library.html
+++ b/lib/templates/library.html
@@ -26,6 +26,18 @@ <h2>Classes</h2>
     </section>
     {{/library.hasPublicClasses}}
 
+    {{#library.hasPublicMixins}}
+    <section class="summary offset-anchor" id="mixins">
+      <h2>Mixins</h2>
+
+      <dl>
+        {{#library.publicMixins}}
+        {{>mixin}}
+        {{/library.publicMixins}}
+      </dl>
+    </section>
+    {{/library.hasPublicMixins}}
+
     {{#library.hasPublicConstants}}
     <section class="summary offset-anchor" id="constants">
       <h2>Constants</h2>
diff --git a/lib/templates/mixin.html b/lib/templates/mixin.html
new file mode 100644
index 0000000000..4987610270
--- /dev/null
+++ b/lib/templates/mixin.html
@@ -0,0 +1,179 @@
+{{>head}}
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>{{parent.name}} {{parent.kind}}</h5>
+    {{>sidebar_for_library}}
+  </div>
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    {{#self}}
+      <h1>{{{nameWithGenerics}}} {{kind}} {{>categorization}}</h1>
+    {{/self}}
+
+    {{#mixin}}
+    {{>documentation}}
+    {{/mixin}}
+
+    {{#mixin.hasModifiers}}
+    <section>
+      <dl class="dl-horizontal">
+        {{#mixin.hasPublicSuperclassConstraints}}
+        <dt>Superclass Constraints</dt>
+        <dd><ul class="comma-separated dark mixin-relationships">
+          {{#mixin.publicSuperclassConstraints}}
+          <li>{{{linkedName}}}</li>
+          {{/mixin.publicSuperclassConstraints}}
+        </ul></dd>
+        {{/mixin.hasPublicSuperclassConstraints}}
+
+        {{#mixin.hasPublicSuperChainReversed}}
+        <dt>Inheritance</dt>
+        <dd><ul class="gt-separated dark mixin-relationships">
+          <li>{{{linkedObjectType}}}</li>
+          {{#mixin.publicSuperChainReversed}}
+          <li>{{{linkedName}}}</li>
+          {{/mixin.publicSuperChainReversed}}
+          <li>{{{name}}}</li>
+        </ul></dd>
+        {{/mixin.hasPublicSuperChainReversed}}
+
+        {{#mixin.hasPublicInterfaces}}
+        <dt>Implements</dt>
+        <dd>
+          <ul class="comma-separated mixin-relationships">
+            {{#mixin.publicInterfaces}}
+            <li>{{{linkedName}}}</li>
+            {{/mixin.publicInterfaces}}
+          </ul>
+        </dd>
+        {{/mixin.hasPublicInterfaces}}
+
+        {{#mixin.hasPublicMixins}}
+        <dt>Mixes-in</dt>
+        <dd><ul class="comma-separated mixin-relationships">
+          {{#mixin.publicMixins}}
+          <li>{{{linkedName}}}</li>
+          {{/mixin.publicMixins}}
+        </ul></dd>
+        {{/mixin.hasPublicMixins}}
+
+        {{#mixin.hasPublicImplementors}}
+        <dt>Implemented by</dt>
+        <dd><ul class="comma-separated mixin-relationships">
+          {{#mixin.publicImplementors}}
+          <li>{{{linkedName}}}</li>
+          {{/mixin.publicImplementors}}
+        </ul></dd>
+        {{/mixin.hasPublicImplementors}}
+
+        {{#mixin.hasAnnotations}}
+        <dt>Annotations</dt>
+        <dd><ul class="annotation-list mixin-relationships">
+          {{#mixin.annotations}}
+          <li>{{{.}}}</li>
+          {{/mixin.annotations}}
+        </ul></dd>
+        {{/mixin.hasAnnotations}}
+      </dl>
+    </section>
+    {{/mixin.hasModifiers}}
+
+    {{#mixin.hasPublicConstructors}}
+    <section class="summary offset-anchor" id="constructors">
+      <h2>Constructors</h2>
+
+      <dl class="constructor-summary-list">
+        {{#mixin.publicConstructors}}
+        <dt id="{{htmlId}}" class="callable">
+          <span class="name">{{{linkedName}}}</span><span class="signature">({{{ linkedParams }}})</span>
+        </dt>
+        <dd>
+          {{{ oneLineDoc }}}
+          {{#isConst}}
+          <div class="constructor-modifier features">const</div>
+          {{/isConst}}
+          {{#isFactory}}
+          <div class="constructor-modifier features">factory</div>
+          {{/isFactory}}
+        </dd>
+        {{/mixin.publicConstructors}}
+      </dl>
+    </section>
+    {{/mixin.hasPublicConstructors}}
+
+    {{#mixin.hasPublicProperties}}
+    <section class="summary offset-anchor{{ #allPublicInstancePropertiesInherited }} inherited{{ /allPublicInstancePropertiesInherited }}" id="instance-properties">
+      <h2>Properties</h2>
+
+      <dl class="properties">
+        {{#mixin.allPublicInstanceProperties}}
+        {{>property}}
+        {{/mixin.allPublicInstanceProperties}}
+      </dl>
+    </section>
+    {{/mixin.hasPublicProperties}}
+
+    {{#mixin.hasPublicMethods}}
+    <section class="summary offset-anchor{{ #allPublicInstanceMethodsInherited }} inherited{{ /allPublicInstanceMethodsInherited }}" id="instance-methods">
+      <h2>Methods</h2>
+      <dl class="callables">
+        {{#mixin.allPublicInstanceMethods}}
+        {{>callable}}
+        {{/mixin.allPublicInstanceMethods}}
+      </dl>
+    </section>
+    {{/mixin.hasPublicMethods}}
+
+    {{#mixin.hasPublicOperators}}
+    <section class="summary offset-anchor{{ #allPublicOperatorsInherited }} inherited{{ /allPublicOperatorsInherited}}" id="operators">
+      <h2>Operators</h2>
+      <dl class="callables">
+        {{#mixin.allPublicOperators}}
+        {{>callable}}
+        {{/mixin.allPublicOperators}}
+      </dl>
+    </section>
+    {{/mixin.hasPublicOperators}}
+
+    {{#mixin.hasPublicStaticProperties}}
+    <section class="summary offset-anchor" id="static-properties">
+      <h2>Static Properties</h2>
+
+      <dl class="properties">
+        {{#mixin.publicStaticProperties}}
+        {{>property}}
+        {{/mixin.publicStaticProperties}}
+      </dl>
+    </section>
+    {{/mixin.hasPublicStaticProperties}}
+
+    {{#mixin.hasPublicStaticMethods}}
+    <section class="summary offset-anchor" id="static-methods">
+      <h2>Static Methods</h2>
+      <dl class="callables">
+        {{#mixin.publicStaticMethods}}
+        {{>callable}}
+        {{/mixin.publicStaticMethods}}
+      </dl>
+    </section>
+    {{/mixin.hasPublicStaticMethods}}
+
+    {{#mixin.hasPublicConstants}}
+    <section class="summary offset-anchor" id="constants">
+      <h2>Constants</h2>
+
+      <dl class="properties">
+        {{#mixin.publicConstants}}
+        {{>constant}}
+        {{/mixin.publicConstants}}
+      </dl>
+    </section>
+    {{/mixin.hasPublicConstants}}
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+    {{>sidebar_for_class}}
+  </div><!--/.sidebar-offcanvas-->
+
+{{>footer}}
diff --git a/pubspec.lock b/pubspec.lock
index 527a06198c..2b4afdea0e 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -7,7 +7,7 @@ packages:
       name: analyzer
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.32.4"
+    version: "0.33.0"
   args:
     dependency: "direct main"
     description:
@@ -35,7 +35,7 @@ packages:
       name: build
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.7+2"
+    version: "0.12.7+3"
   build_cli_annotations:
     dependency: transitive
     description:
@@ -49,14 +49,14 @@ packages:
       name: build_config
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.1+2"
+    version: "0.3.1+3"
   build_resolvers:
     dependency: transitive
     description:
       name: build_resolvers
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.1+1"
+    version: "0.2.2+5"
   build_runner:
     dependency: "direct dev"
     description:
@@ -77,7 +77,7 @@ packages:
       name: build_version
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.0"
+    version: "1.0.1"
   built_collection:
     dependency: transitive
     description:
@@ -147,7 +147,7 @@ packages:
       name: dart_style
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.3"
+    version: "1.2.0"
   dhttpd:
     dependency: "direct dev"
     description:
@@ -175,7 +175,7 @@ packages:
       name: front_end
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.4"
+    version: "0.1.6"
   glob:
     dependency: "direct dev"
     description:
@@ -266,7 +266,7 @@ packages:
       name: kernel
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.4"
+    version: "0.3.6"
   logging:
     dependency: "direct main"
     description:
@@ -420,7 +420,7 @@ packages:
       name: shelf_web_socket
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.2+3"
+    version: "0.2.2+4"
   source_map_stack_trace:
     dependency: transitive
     description:
@@ -483,7 +483,7 @@ packages:
       name: test
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "1.3.3"
   typed_data:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index f8a0f0d3d2..2a92c4dd7d 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -5,10 +5,10 @@ author: Dart Team <misc@dartlang.org>
 description: A documentation generator for Dart.
 homepage: https://github.com/dart-lang/dartdoc
 environment:
-  sdk: '>=2.0.0-dev.68 <3.0.0'
+  sdk: '>=2.0.0 <3.0.0'
 
 dependencies:
-  analyzer: ^0.32.4
+  analyzer: ^0.33.0
   args: '>=1.4.1 <2.0.0'
   collection: ^1.2.0
   html: '>=0.12.1 <0.14.0'
@@ -41,5 +41,8 @@ dev_dependencies:
   meta: ^1.0.0
   test: ^1.3.0
 
+dependency_overrides:
+  analyzer: 0.33.0
+
 executables:
   dartdoc: null
diff --git a/test/model_test.dart b/test/model_test.dart
index 41bab20fc7..22bff52678 100644
--- a/test/model_test.dart
+++ b/test/model_test.dart
@@ -1212,6 +1212,8 @@ void main() {
     });
 
     test('bullet points work in top level variables', () {
+      expect(bulletDoced.oneLineDoc,
+          contains('<a href="fake/bulletDoced-constant.html">[...]</a>'));
       expect(bulletDoced.documentationAsHtml, contains('<li>'));
     });
   });
@@ -1231,6 +1233,134 @@ void main() {
     });
   });
 
+  group('Mixin', () {
+    Mixin GenericMixin;
+    Class GenericClass, ModifierClass, TypeInferenceMixedIn;
+    Field overrideByEverything,
+        overrideByGenericMixin,
+        overrideByBoth,
+        overrideByModifierClass;
+
+    setUp(() {
+      Iterable<Class> classes = fakeLibrary.publicClasses;
+      GenericClass = classes.firstWhere((c) => c.name == 'GenericClass');
+      ModifierClass = classes.firstWhere((c) => c.name == 'ModifierClass');
+      GenericMixin =
+          fakeLibrary.publicMixins.firstWhere((m) => m.name == 'GenericMixin');
+      TypeInferenceMixedIn =
+          classes.firstWhere((c) => c.name == 'TypeInferenceMixedIn');
+      overrideByEverything = TypeInferenceMixedIn.allFields
+          .firstWhere((f) => f.name == 'overrideByEverything');
+      overrideByGenericMixin = TypeInferenceMixedIn.allFields
+          .firstWhere((f) => f.name == 'overrideByGenericMixin');
+      overrideByBoth = TypeInferenceMixedIn.allFields
+          .firstWhere((f) => f.name == 'overrideByBoth');
+      overrideByModifierClass = TypeInferenceMixedIn.allFields
+          .firstWhere((f) => f.name == 'overrideByModifierClass');
+    });
+
+    test(('Verify inheritance/mixin structure and type inference'), () {
+      expect(
+          TypeInferenceMixedIn.mixins
+              .map<String>((DefinedElementType t) => t.element.name),
+          orderedEquals(['GenericMixin']));
+      expect(
+          TypeInferenceMixedIn.mixins.first.typeArguments
+              .map<String>((ElementType t) => t.name),
+          orderedEquals(['int']));
+
+      expect(TypeInferenceMixedIn.superChain.length, equals(2));
+      final ParameterizedElementType firstType =
+          TypeInferenceMixedIn.superChain.first;
+      final ParameterizedElementType lastType =
+          TypeInferenceMixedIn.superChain.last;
+      expect(firstType.name, equals('ModifierClass'));
+      expect(firstType.typeArguments.map<String>((ElementType t) => t.name),
+          orderedEquals(['int']));
+      expect(lastType.name, equals('GenericClass'));
+      expect(lastType.typeArguments.map<String>((ElementType t) => t.name),
+          orderedEquals(['int']));
+    });
+
+    test(('Verify non-overridden members have right canonical classes'), () {
+      final Field member =
+          TypeInferenceMixedIn.allFields.firstWhere((f) => f.name == 'member');
+      final Field modifierMember = TypeInferenceMixedIn.allFields
+          .firstWhere((f) => f.name == 'modifierMember');
+      final Field mixinMember = TypeInferenceMixedIn.allFields
+          .firstWhere((f) => f.name == 'mixinMember');
+      expect(member.canonicalEnclosingElement, equals(GenericClass));
+      expect(modifierMember.canonicalEnclosingElement, equals(ModifierClass));
+      expect(mixinMember.canonicalEnclosingElement, equals(GenericMixin));
+    });
+
+    test(('Verify overrides & documentation inheritance work as intended'), () {
+      expect(overrideByEverything.canonicalEnclosingElement,
+          equals(TypeInferenceMixedIn));
+      expect(overrideByGenericMixin.canonicalEnclosingElement,
+          equals(GenericMixin));
+      expect(overrideByBoth.canonicalEnclosingElement, equals(GenericMixin));
+      expect(overrideByModifierClass.canonicalEnclosingElement,
+          equals(ModifierClass));
+      expect(
+          overrideByEverything.documentationFrom.first,
+          equals(GenericClass.allFields
+              .firstWhere((f) => f.name == 'overrideByEverything')
+              .getter));
+      expect(
+          overrideByGenericMixin.documentationFrom.first,
+          equals(GenericClass.allFields
+              .firstWhere((f) => f.name == 'overrideByGenericMixin')
+              .getter));
+      expect(
+          overrideByBoth.documentationFrom.first,
+          equals(GenericClass.allFields
+              .firstWhere((f) => f.name == 'overrideByBoth')
+              .getter));
+      expect(
+          overrideByModifierClass.documentationFrom.first,
+          equals(GenericClass.allFields
+              .firstWhere((f) => f.name == 'overrideByModifierClass')
+              .getter));
+    });
+
+    test(('Verify that documentation for mixin applications contains links'),
+        () {
+      expect(
+          overrideByModifierClass.oneLineDoc,
+          contains(
+              '<a href=\"fake/ModifierClass-class.html\">ModifierClass</a>'));
+      expect(
+          overrideByModifierClass.canonicalModelElement.documentationAsHtml,
+          contains(
+              '<a href=\"fake/ModifierClass-class.html\">ModifierClass</a>'));
+      expect(
+          overrideByGenericMixin.oneLineDoc,
+          contains(
+              '<a href=\"fake/GenericMixin-mixin.html\">GenericMixin</a>'));
+      expect(
+          overrideByGenericMixin.canonicalModelElement.documentationAsHtml,
+          contains(
+              '<a href=\"fake/GenericMixin-mixin.html\">GenericMixin</a>'));
+      expect(
+          overrideByBoth.oneLineDoc,
+          contains(
+              '<a href=\"fake/ModifierClass-class.html\">ModifierClass</a>'));
+      expect(
+          overrideByBoth.oneLineDoc,
+          contains(
+              '<a href=\"fake/GenericMixin-mixin.html\">GenericMixin</a>'));
+      expect(
+          overrideByBoth.canonicalModelElement.documentationAsHtml,
+          contains(
+              '<a href=\"fake/ModifierClass-class.html\">ModifierClass</a>'));
+      expect(
+          overrideByBoth.canonicalModelElement.documentationAsHtml,
+          contains(
+              '<a href=\"fake/GenericMixin-mixin.html\">GenericMixin</a>'));
+    });
+  });
+
   group('Class', () {
     List<Class> classes;
     Class Apple, B, Cat, Cool, Dog, F, Dep, SpecialList;
diff --git a/testing/test_package/lib/fake.dart b/testing/test_package/lib/fake.dart
index b4791759ad..74bb6f3f1a 100644
--- a/testing/test_package/lib/fake.dart
+++ b/testing/test_package/lib/fake.dart
@@ -283,9 +283,74 @@ class AMixinCallingSuper extends NotAMixin {
   String get superString => "${super.superString} but not as important as this";
 }
 
+/// I am a new style mixin using the new mixin syntax.
+mixin NewStyleMixinCallingSuper on NotAMixin {
+  @override
+
+  /// I have documentation for an overridden method named [superString],
+  /// different from [NotAMixin.superString].
+  String get superString =>
+      "${super.superString} but moderately less important than this";
+}
+
 /// Verify super-mixins don't break Dartdoc.
 class AClassUsingASuperMixin extends AnotherInterface with AMixinCallingSuper {}
 
+/// A class mixing in a single new-style mixin.
+class AClassUsingNewStyleMixin extends NotAMixin
+    with NewStyleMixinCallingSuper {}
+
+/// A generic class for testing type inference.
+class GenericClass<T> {
+  T member;
+
+  /// Destined to be overridden by [ModifierClass].
+  T overrideByModifierClass;
+
+  /// Destined to be overridden by [GenericMixin].
+  T overrideByGenericMixin;
+
+  /// Destined to be overridden by [ModifierClass] and [GenericMixin], both.
+  T overrideByBoth;
+
+  /// Destined to be overridden by everything.
+  T overrideByEverything;
+}
+
+/// A class extending a generic class.
+class ModifierClass<T> extends GenericClass<T> {
+  T modifierMember;
+
+  @override
+  T overrideByModifierClass;
+
+  @override
+  T overrideByBoth;
+
+  @override
+  T overrideByEverything;
+}
+
+/// A generic mixin that requires GenericClass as a superclass.
+mixin GenericMixin<T> on GenericClass<T> {
+  T mixinMember;
+
+  @override
+  T overrideByGenericMixin;
+
+  @override
+  T overrideByBoth;
+
+  @override
+  T overrideByEverything;
+}
+
+/// A class verifying type inference across new-style mixins.
+class TypeInferenceMixedIn extends ModifierClass<int> with GenericMixin {
+  @override
+  int overrideByEverything;
+}
+
 /// A super class, with many powers. Link to [Apple] from another library.
 @deprecated
 class SuperAwesomeClass {
diff --git a/testing/test_package_docs/anonymous_library/anonymous_library-library.html b/testing/test_package_docs/anonymous_library/anonymous_library-library.html
index 2f0d6ef67d..35e58fd823 100644
--- a/testing/test_package_docs/anonymous_library/anonymous_library-library.html
+++ b/testing/test_package_docs/anonymous_library/anonymous_library-library.html
@@ -69,6 +69,7 @@ <h1>anonymous_library library </h1>
 
 
 
+
     <section class="summary offset-anchor" id="functions">
       <h2>Functions</h2>
 
@@ -96,6 +97,7 @@ <h5>anonymous_library library</h5>
     
     
     
+    
       <li class="section-title"><a href="anonymous_library/anonymous_library-library.html#functions">Functions</a></li>
       <li><a href="anonymous_library/doesStuff.html">doesStuff</a></li>
     
diff --git a/testing/test_package_docs/anonymous_library/doesStuff.html b/testing/test_package_docs/anonymous_library/doesStuff.html
index 1a498697cb..87b6392d97 100644
--- a/testing/test_package_docs/anonymous_library/doesStuff.html
+++ b/testing/test_package_docs/anonymous_library/doesStuff.html
@@ -41,6 +41,7 @@ <h5>anonymous_library library</h5>
     
     
     
+    
       <li class="section-title"><a href="anonymous_library/anonymous_library-library.html#functions">Functions</a></li>
       <li><a href="anonymous_library/doesStuff.html">doesStuff</a></li>
     
diff --git a/testing/test_package_docs/another_anonymous_lib/another_anonymous_lib-library.html b/testing/test_package_docs/another_anonymous_lib/another_anonymous_lib-library.html
index 615dc5679e..8dc9c1a11e 100644
--- a/testing/test_package_docs/another_anonymous_lib/another_anonymous_lib-library.html
+++ b/testing/test_package_docs/another_anonymous_lib/another_anonymous_lib-library.html
@@ -69,6 +69,7 @@ <h1>another_anonymous_lib library </h1>
 
 
 
+
     <section class="summary offset-anchor" id="functions">
       <h2>Functions</h2>
 
@@ -96,6 +97,7 @@ <h5>another_anonymous_lib library</h5>
     
     
     
+    
       <li class="section-title"><a href="another_anonymous_lib/another_anonymous_lib-library.html#functions">Functions</a></li>
       <li><a href="another_anonymous_lib/greeting.html">greeting</a></li>
     
diff --git a/testing/test_package_docs/another_anonymous_lib/greeting.html b/testing/test_package_docs/another_anonymous_lib/greeting.html
index c07f32a6fd..3e7dcfa215 100644
--- a/testing/test_package_docs/another_anonymous_lib/greeting.html
+++ b/testing/test_package_docs/another_anonymous_lib/greeting.html
@@ -41,6 +41,7 @@ <h5>another_anonymous_lib library</h5>
     
     
     
+    
       <li class="section-title"><a href="another_anonymous_lib/another_anonymous_lib-library.html#functions">Functions</a></li>
       <li><a href="another_anonymous_lib/greeting.html">greeting</a></li>
     
diff --git a/testing/test_package_docs/categoriesExported/IAmAClassWithCategories-class.html b/testing/test_package_docs/categoriesExported/IAmAClassWithCategories-class.html
index eec9c6368a..ee9afac76a 100644
--- a/testing/test_package_docs/categoriesExported/IAmAClassWithCategories-class.html
+++ b/testing/test_package_docs/categoriesExported/IAmAClassWithCategories-class.html
@@ -46,6 +46,7 @@ <h5>categoriesExported library</h5>
     
     
     
+    
     </ol>
   </div>
 
diff --git a/testing/test_package_docs/categoriesExported/categoriesExported-library.html b/testing/test_package_docs/categoriesExported/categoriesExported-library.html
index 13bf0bb7dd..bf955d52ad 100644
--- a/testing/test_package_docs/categoriesExported/categoriesExported-library.html
+++ b/testing/test_package_docs/categoriesExported/categoriesExported-library.html
@@ -85,6 +85,7 @@ <h2>Classes</h2>
 
 
 
+
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
@@ -98,6 +99,7 @@ <h5>categoriesExported library</h5>
     
     
     
+    
     </ol>
   </div><!--/sidebar-offcanvas-right-->
 
diff --git a/testing/test_package_docs/code_in_comments/code_in_comments-library.html b/testing/test_package_docs/code_in_comments/code_in_comments-library.html
index 2cef34da6d..f777dec8b2 100644
--- a/testing/test_package_docs/code_in_comments/code_in_comments-library.html
+++ b/testing/test_package_docs/code_in_comments/code_in_comments-library.html
@@ -84,6 +84,7 @@ <h1>code_in_comments library </h1>
 
 
 
+
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
@@ -95,6 +96,7 @@ <h5>code_in_comments library</h5>
     
     
     
+    
     </ol>
   </div><!--/sidebar-offcanvas-right-->
 
diff --git a/testing/test_package_docs/css/css-library.html b/testing/test_package_docs/css/css-library.html
index 76ee0edb73..c4e97713c7 100644
--- a/testing/test_package_docs/css/css-library.html
+++ b/testing/test_package_docs/css/css-library.html
@@ -72,6 +72,7 @@ <h1>css library </h1>
     
 
 
+
     <section class="summary offset-anchor" id="properties">
       <h2>Properties</h2>
 
@@ -98,6 +99,7 @@ <h5>css library</h5>
     <ol>
     
     
+    
       <li class="section-title"><a href="css/css-library.html#properties">Properties</a></li>
       <li><a href="css/theOnlyThingInTheLibrary.html">theOnlyThingInTheLibrary</a></li>
     
diff --git a/testing/test_package_docs/css/theOnlyThingInTheLibrary.html b/testing/test_package_docs/css/theOnlyThingInTheLibrary.html
index 7671e69e71..489cf57eeb 100644
--- a/testing/test_package_docs/css/theOnlyThingInTheLibrary.html
+++ b/testing/test_package_docs/css/theOnlyThingInTheLibrary.html
@@ -40,6 +40,7 @@ <h5>css library</h5>
     <ol>
     
     
+    
       <li class="section-title"><a href="css/css-library.html#properties">Properties</a></li>
       <li><a href="css/theOnlyThingInTheLibrary.html">theOnlyThingInTheLibrary</a></li>
     
diff --git a/testing/test_package_docs/ex/Animal-class.html b/testing/test_package_docs/ex/Animal-class.html
index dc9cf04644..2c4dc04b07 100644
--- a/testing/test_package_docs/ex/Animal-class.html
+++ b/testing/test_package_docs/ex/Animal-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs/ex/AnotherParameterizedClass-class.html b/testing/test_package_docs/ex/AnotherParameterizedClass-class.html
index 9c1a63b10a..656df835bd 100644
--- a/testing/test_package_docs/ex/AnotherParameterizedClass-class.html
+++ b/testing/test_package_docs/ex/AnotherParameterizedClass-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs/ex/Apple-class.html b/testing/test_package_docs/ex/Apple-class.html
index e7f44b103c..986e6a52a3 100644
--- a/testing/test_package_docs/ex/Apple-class.html
+++ b/testing/test_package_docs/ex/Apple-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs/ex/B-class.html b/testing/test_package_docs/ex/B-class.html
index 3c9cbb1e52..61660e735a 100644
--- a/testing/test_package_docs/ex/B-class.html
+++ b/testing/test_package_docs/ex/B-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs/ex/COLOR-constant.html b/testing/test_package_docs/ex/COLOR-constant.html
index 8ed51eb106..27949bcffc 100644
--- a/testing/test_package_docs/ex/COLOR-constant.html
+++ b/testing/test_package_docs/ex/COLOR-constant.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs/ex/COLOR_GREEN-constant.html b/testing/test_package_docs/ex/COLOR_GREEN-constant.html
index acfdb113d7..f539a49ff5 100644
--- a/testing/test_package_docs/ex/COLOR_GREEN-constant.html
+++ b/testing/test_package_docs/ex/COLOR_GREEN-constant.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs/ex/COLOR_ORANGE-constant.html b/testing/test_package_docs/ex/COLOR_ORANGE-constant.html
index 729e501fcb..c6359e916d 100644
--- a/testing/test_package_docs/ex/COLOR_ORANGE-constant.html
+++ b/testing/test_package_docs/ex/COLOR_ORANGE-constant.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs/ex/COMPLEX_COLOR-constant.html b/testing/test_package_docs/ex/COMPLEX_COLOR-constant.html
index a3cc88b8dc..3dde0f7ce7 100644
--- a/testing/test_package_docs/ex/COMPLEX_COLOR-constant.html
+++ b/testing/test_package_docs/ex/COMPLEX_COLOR-constant.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs/ex/Cat-class.html b/testing/test_package_docs/ex/Cat-class.html
index c189b22c4e..c089c7c7c1 100644
--- a/testing/test_package_docs/ex/Cat-class.html
+++ b/testing/test_package_docs/ex/Cat-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs/ex/CatString-class.html b/testing/test_package_docs/ex/CatString-class.html
index 2f3d6407f9..c44a0039c3 100644
--- a/testing/test_package_docs/ex/CatString-class.html
+++ b/testing/test_package_docs/ex/CatString-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs/ex/ConstantCat-class.html b/testing/test_package_docs/ex/ConstantCat-class.html
index 4ca62f3a46..2f821b1b29 100644
--- a/testing/test_package_docs/ex/ConstantCat-class.html
+++ b/testing/test_package_docs/ex/ConstantCat-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs/ex/Deprecated-class.html b/testing/test_package_docs/ex/Deprecated-class.html
index 04729eeda7..c42fac1d75 100644
--- a/testing/test_package_docs/ex/Deprecated-class.html
+++ b/testing/test_package_docs/ex/Deprecated-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs/ex/Dog-class.html b/testing/test_package_docs/ex/Dog-class.html
index 022fe0e5fc..b8ec81eaf2 100644
--- a/testing/test_package_docs/ex/Dog-class.html
+++ b/testing/test_package_docs/ex/Dog-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs/ex/E-class.html b/testing/test_package_docs/ex/E-class.html
index f8ae03f864..b5d93a53f9 100644
--- a/testing/test_package_docs/ex/E-class.html
+++ b/testing/test_package_docs/ex/E-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs/ex/ExtendedShortName-class.html b/testing/test_package_docs/ex/ExtendedShortName-class.html
index 0c5ce21f9b..919df7ffca 100644
--- a/testing/test_package_docs/ex/ExtendedShortName-class.html
+++ b/testing/test_package_docs/ex/ExtendedShortName-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs/ex/F-class.html b/testing/test_package_docs/ex/F-class.html
index 8275c5b6cf..01271dc563 100644
--- a/testing/test_package_docs/ex/F-class.html
+++ b/testing/test_package_docs/ex/F-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs/ex/ForAnnotation-class.html b/testing/test_package_docs/ex/ForAnnotation-class.html
index a60516bc13..b28a3918aa 100644
--- a/testing/test_package_docs/ex/ForAnnotation-class.html
+++ b/testing/test_package_docs/ex/ForAnnotation-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs/ex/HasAnnotation-class.html b/testing/test_package_docs/ex/HasAnnotation-class.html
index 75b7a4a60e..a5c47e148e 100644
--- a/testing/test_package_docs/ex/HasAnnotation-class.html
+++ b/testing/test_package_docs/ex/HasAnnotation-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs/ex/Helper-class.html b/testing/test_package_docs/ex/Helper-class.html
index f1241bed91..ce414955cb 100644
--- a/testing/test_package_docs/ex/Helper-class.html
+++ b/testing/test_package_docs/ex/Helper-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs/ex/Klass-class.html b/testing/test_package_docs/ex/Klass-class.html
index a72060a8fa..db46c06f4e 100644
--- a/testing/test_package_docs/ex/Klass-class.html
+++ b/testing/test_package_docs/ex/Klass-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs/ex/MY_CAT-constant.html b/testing/test_package_docs/ex/MY_CAT-constant.html
index 1ee43d0528..db7eaf6c82 100644
--- a/testing/test_package_docs/ex/MY_CAT-constant.html
+++ b/testing/test_package_docs/ex/MY_CAT-constant.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs/ex/MyError-class.html b/testing/test_package_docs/ex/MyError-class.html
index dc50226021..d0307a1f2b 100644
--- a/testing/test_package_docs/ex/MyError-class.html
+++ b/testing/test_package_docs/ex/MyError-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs/ex/MyErrorImplements-class.html b/testing/test_package_docs/ex/MyErrorImplements-class.html
index bc4c4541d5..a7a3a70ee2 100644
--- a/testing/test_package_docs/ex/MyErrorImplements-class.html
+++ b/testing/test_package_docs/ex/MyErrorImplements-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs/ex/MyException-class.html b/testing/test_package_docs/ex/MyException-class.html
index 71fd791e9f..7dc43df66b 100644
--- a/testing/test_package_docs/ex/MyException-class.html
+++ b/testing/test_package_docs/ex/MyException-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs/ex/MyExceptionImplements-class.html b/testing/test_package_docs/ex/MyExceptionImplements-class.html
index 1689825cac..08d4627268 100644
--- a/testing/test_package_docs/ex/MyExceptionImplements-class.html
+++ b/testing/test_package_docs/ex/MyExceptionImplements-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs/ex/PRETTY_COLORS-constant.html b/testing/test_package_docs/ex/PRETTY_COLORS-constant.html
index 7b171ff690..4dfcf59fe1 100644
--- a/testing/test_package_docs/ex/PRETTY_COLORS-constant.html
+++ b/testing/test_package_docs/ex/PRETTY_COLORS-constant.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs/ex/ParameterizedClass-class.html b/testing/test_package_docs/ex/ParameterizedClass-class.html
index 5e7bc1a630..c3f26d7c69 100644
--- a/testing/test_package_docs/ex/ParameterizedClass-class.html
+++ b/testing/test_package_docs/ex/ParameterizedClass-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs/ex/ParameterizedTypedef.html b/testing/test_package_docs/ex/ParameterizedTypedef.html
index bf2978d5b1..eb825cb388 100644
--- a/testing/test_package_docs/ex/ParameterizedTypedef.html
+++ b/testing/test_package_docs/ex/ParameterizedTypedef.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs/ex/PublicClassExtendsPrivateClass-class.html b/testing/test_package_docs/ex/PublicClassExtendsPrivateClass-class.html
index 36b55c8f56..f82240fa97 100644
--- a/testing/test_package_docs/ex/PublicClassExtendsPrivateClass-class.html
+++ b/testing/test_package_docs/ex/PublicClassExtendsPrivateClass-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface-class.html b/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface-class.html
index 4b8a5ab3fa..83fa869062 100644
--- a/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface-class.html
+++ b/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs/ex/ShapeType-class.html b/testing/test_package_docs/ex/ShapeType-class.html
index cdca4bf0ec..b2e8f497c1 100644
--- a/testing/test_package_docs/ex/ShapeType-class.html
+++ b/testing/test_package_docs/ex/ShapeType-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs/ex/ShortName-class.html b/testing/test_package_docs/ex/ShortName-class.html
index 45b8af833b..6978f1e366 100644
--- a/testing/test_package_docs/ex/ShortName-class.html
+++ b/testing/test_package_docs/ex/ShortName-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs/ex/SpecializedDuration-class.html b/testing/test_package_docs/ex/SpecializedDuration-class.html
index c8e5fc7727..22a9b2d1e4 100644
--- a/testing/test_package_docs/ex/SpecializedDuration-class.html
+++ b/testing/test_package_docs/ex/SpecializedDuration-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs/ex/TemplatedClass-class.html b/testing/test_package_docs/ex/TemplatedClass-class.html
index edceac636b..48284dc0d1 100644
--- a/testing/test_package_docs/ex/TemplatedClass-class.html
+++ b/testing/test_package_docs/ex/TemplatedClass-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs/ex/TemplatedInterface-class.html b/testing/test_package_docs/ex/TemplatedInterface-class.html
index ee27965c2f..2430992701 100644
--- a/testing/test_package_docs/ex/TemplatedInterface-class.html
+++ b/testing/test_package_docs/ex/TemplatedInterface-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs/ex/ToolUser-class.html b/testing/test_package_docs/ex/ToolUser-class.html
index 316b655ec4..b4faff0150 100644
--- a/testing/test_package_docs/ex/ToolUser-class.html
+++ b/testing/test_package_docs/ex/ToolUser-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs-class.html b/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs-class.html
index bb7f483738..e640b32ab8 100644
--- a/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs-class.html
+++ b/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs/ex/WithGeneric-class.html b/testing/test_package_docs/ex/WithGeneric-class.html
index 77f3e06b0d..13e7b2dcba 100644
--- a/testing/test_package_docs/ex/WithGeneric-class.html
+++ b/testing/test_package_docs/ex/WithGeneric-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs/ex/WithGenericSub-class.html b/testing/test_package_docs/ex/WithGenericSub-class.html
index 5b2833452b..9fa67f6707 100644
--- a/testing/test_package_docs/ex/WithGenericSub-class.html
+++ b/testing/test_package_docs/ex/WithGenericSub-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs/ex/aComplexTypedef.html b/testing/test_package_docs/ex/aComplexTypedef.html
index 7a92b5f98d..57bdb5b9f5 100644
--- a/testing/test_package_docs/ex/aComplexTypedef.html
+++ b/testing/test_package_docs/ex/aComplexTypedef.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs/ex/aThingToDo-class.html b/testing/test_package_docs/ex/aThingToDo-class.html
index c17ddd2fcf..fe926de03c 100644
--- a/testing/test_package_docs/ex/aThingToDo-class.html
+++ b/testing/test_package_docs/ex/aThingToDo-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs/ex/deprecated-constant.html b/testing/test_package_docs/ex/deprecated-constant.html
index 318362f29a..02b5612819 100644
--- a/testing/test_package_docs/ex/deprecated-constant.html
+++ b/testing/test_package_docs/ex/deprecated-constant.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs/ex/deprecatedField.html b/testing/test_package_docs/ex/deprecatedField.html
index 166c84538c..475d074af5 100644
--- a/testing/test_package_docs/ex/deprecatedField.html
+++ b/testing/test_package_docs/ex/deprecatedField.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs/ex/deprecatedGetter.html b/testing/test_package_docs/ex/deprecatedGetter.html
index e0541a2836..69d1e56de1 100644
--- a/testing/test_package_docs/ex/deprecatedGetter.html
+++ b/testing/test_package_docs/ex/deprecatedGetter.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs/ex/deprecatedSetter.html b/testing/test_package_docs/ex/deprecatedSetter.html
index ef6cbd3b26..253a465018 100644
--- a/testing/test_package_docs/ex/deprecatedSetter.html
+++ b/testing/test_package_docs/ex/deprecatedSetter.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs/ex/ex-library.html b/testing/test_package_docs/ex/ex-library.html
index 8729ae3c01..2b118d20ca 100644
--- a/testing/test_package_docs/ex/ex-library.html
+++ b/testing/test_package_docs/ex/ex-library.html
@@ -253,6 +253,7 @@ <h2>Classes</h2>
       </dl>
     </section>
 
+
     <section class="summary offset-anchor" id="constants">
       <h2>Constants</h2>
 
@@ -546,6 +547,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs/ex/function1.html b/testing/test_package_docs/ex/function1.html
index a64b0530fc..67b7985441 100644
--- a/testing/test_package_docs/ex/function1.html
+++ b/testing/test_package_docs/ex/function1.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs/ex/genericFunction.html b/testing/test_package_docs/ex/genericFunction.html
index 893e3bf046..f3818c57fb 100644
--- a/testing/test_package_docs/ex/genericFunction.html
+++ b/testing/test_package_docs/ex/genericFunction.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs/ex/incorrectDocReference-constant.html b/testing/test_package_docs/ex/incorrectDocReference-constant.html
index 6630af044f..2dba274bc6 100644
--- a/testing/test_package_docs/ex/incorrectDocReference-constant.html
+++ b/testing/test_package_docs/ex/incorrectDocReference-constant.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs/ex/incorrectDocReferenceFromEx-constant.html b/testing/test_package_docs/ex/incorrectDocReferenceFromEx-constant.html
index d3971cf72d..81ef5d3ba2 100644
--- a/testing/test_package_docs/ex/incorrectDocReferenceFromEx-constant.html
+++ b/testing/test_package_docs/ex/incorrectDocReferenceFromEx-constant.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs/ex/number.html b/testing/test_package_docs/ex/number.html
index f6ffd36f83..865e95199e 100644
--- a/testing/test_package_docs/ex/number.html
+++ b/testing/test_package_docs/ex/number.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs/ex/processMessage.html b/testing/test_package_docs/ex/processMessage.html
index 95cc9644a8..8967e056e6 100644
--- a/testing/test_package_docs/ex/processMessage.html
+++ b/testing/test_package_docs/ex/processMessage.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs/ex/y.html b/testing/test_package_docs/ex/y.html
index 8246dc599c..41457abdd1 100644
--- a/testing/test_package_docs/ex/y.html
+++ b/testing/test_package_docs/ex/y.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs/fake/ABaseClass-class.html b/testing/test_package_docs/fake/ABaseClass-class.html
index f8cdf4c330..4e8ee17001 100644
--- a/testing/test_package_docs/fake/ABaseClass-class.html
+++ b/testing/test_package_docs/fake/ABaseClass-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/AClassUsingASuperMixin-class.html b/testing/test_package_docs/fake/AClassUsingASuperMixin-class.html
index b417ecf778..dc919cc819 100644
--- a/testing/test_package_docs/fake/AClassUsingASuperMixin-class.html
+++ b/testing/test_package_docs/fake/AClassUsingASuperMixin-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/AClassUsingNewStyleMixin-class.html b/testing/test_package_docs/fake/AClassUsingNewStyleMixin-class.html
new file mode 100644
index 0000000000..c8f8f4bf4a
--- /dev/null
+++ b/testing/test_package_docs/fake/AClassUsingNewStyleMixin-class.html
@@ -0,0 +1,327 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the AClassUsingNewStyleMixin class from the fake library, for the Dart programming language.">
+  <title>AClassUsingNewStyleMixin class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li class="self-crumb">AClassUsingNewStyleMixin class</li>
+  </ol>
+  <div class="self-name">AClassUsingNewStyleMixin</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>fake library</h5>
+    <ol>
+      <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
+      <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
+      <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
+      <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
+      <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
+      <li><a href="fake/Annotation-class.html">Annotation</a></li>
+      <li><a href="fake/AnotherInterface-class.html">AnotherInterface</a></li>
+      <li><a href="fake/ATypeTakingClass-class.html">ATypeTakingClass</a></li>
+      <li><a href="fake/ATypeTakingClassMixedIn-class.html">ATypeTakingClassMixedIn</a></li>
+      <li><a href="fake/BaseForDocComments-class.html">BaseForDocComments</a></li>
+      <li><a href="fake/BaseThingy-class.html">BaseThingy</a></li>
+      <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
+      <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
+      <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
+      <li><a href="fake/Cool-class.html">Cool</a></li>
+      <li><a href="fake/DocumentWithATable-class.html">DocumentWithATable</a></li>
+      <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
+      <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
+      <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
+      <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
+      <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
+      <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
+      <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
+      <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
+      <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
+      <li><a href="fake/ImplicitProperties-class.html">ImplicitProperties</a></li>
+      <li><a href="fake/InheritingClassOne-class.html">InheritingClassOne</a></li>
+      <li><a href="fake/InheritingClassTwo-class.html">InheritingClassTwo</a></li>
+      <li><a href="fake/Interface-class.html">Interface</a></li>
+      <li><a href="fake/LongFirstLine-class.html">LongFirstLine</a></li>
+      <li><a href="fake/MIEEBase-class.html">MIEEBase</a></li>
+      <li><a href="fake/MIEEMixin-class.html">MIEEMixin</a></li>
+      <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
+      <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
+      <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
+      <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
+      <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
+      <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
+      <li><a href="fake/ReferringClass-class.html">ReferringClass</a></li>
+      <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+      <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
+      <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
+      <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
+      <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
+      <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
+      <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
+      <li><a href="fake/CUSTOM_CLASS_PRIVATE-constant.html">CUSTOM_CLASS_PRIVATE</a></li>
+      <li><a class="deprecated" href="fake/DOWN-constant.html">DOWN</a></li>
+      <li><a href="fake/greatAnnotation-constant.html">greatAnnotation</a></li>
+      <li><a href="fake/greatestAnnotation-constant.html">greatestAnnotation</a></li>
+      <li><a href="fake/incorrectDocReference-constant.html">incorrectDocReference</a></li>
+      <li><a href="fake/myMap-constant.html">myMap</a></li>
+      <li><a href="fake/NAME_SINGLEUNDERSCORE-constant.html">NAME_SINGLEUNDERSCORE</a></li>
+      <li><a href="fake/NAME_WITH_TWO_UNDERSCORES-constant.html">NAME_WITH_TWO_UNDERSCORES</a></li>
+      <li><a href="fake/PI-constant.html">PI</a></li>
+      <li><a href="fake/required-constant.html">required</a></li>
+      <li><a href="fake/testingCodeSyntaxInOneLiners-constant.html">testingCodeSyntaxInOneLiners</a></li>
+      <li><a href="fake/UP-constant.html">UP</a></li>
+      <li><a href="fake/ZERO-constant.html">ZERO</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
+      <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
+      <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
+      <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
+      <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
+      <li><a href="fake/justGetter.html">justGetter</a></li>
+      <li><a href="fake/justSetter.html">justSetter</a></li>
+      <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
+      <li><a class="deprecated" href="fake/meaningOfLife.html">meaningOfLife</a></li>
+      <li><a href="fake/mustGetThis.html">mustGetThis</a></li>
+      <li><a href="fake/setAndGet.html">setAndGet</a></li>
+      <li><a href="fake/simpleProperty.html">simpleProperty</a></li>
+      <li><a href="fake/useSomethingInAnotherPackage.html">useSomethingInAnotherPackage</a></li>
+      <li><a href="fake/useSomethingInTheSdk.html">useSomethingInTheSdk</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#functions">Functions</a></li>
+      <li><a href="fake/addCallback.html">addCallback</a></li>
+      <li><a href="fake/addCallback2.html">addCallback2</a></li>
+      <li><a href="fake/aVoidParameter.html">aVoidParameter</a></li>
+      <li><a href="fake/functionWithFunctionParameters.html">functionWithFunctionParameters</a></li>
+      <li><a href="fake/myGenericFunction.html">myGenericFunction</a></li>
+      <li><a href="fake/onlyPositionalWithNoDefaultNoType.html">onlyPositionalWithNoDefaultNoType</a></li>
+      <li><a href="fake/paintImage1.html">paintImage1</a></li>
+      <li><a href="fake/paintImage2.html">paintImage2</a></li>
+      <li><a href="fake/paramFromAnotherLib.html">paramFromAnotherLib</a></li>
+      <li><a href="fake/paramOfFutureOrNull.html">paramOfFutureOrNull</a></li>
+      <li><a href="fake/returningFutureVoid.html">returningFutureVoid</a></li>
+      <li><a href="fake/short.html">short</a></li>
+      <li><a href="fake/soIntense.html">soIntense</a></li>
+      <li><a href="fake/thisIsAlsoAsync.html">thisIsAlsoAsync</a></li>
+      <li><a href="fake/thisIsAsync.html">thisIsAsync</a></li>
+      <li><a href="fake/thisIsFutureOr.html">thisIsFutureOr</a></li>
+      <li><a href="fake/thisIsFutureOrNull.html">thisIsFutureOrNull</a></li>
+      <li><a href="fake/thisIsFutureOrT.html">thisIsFutureOrT</a></li>
+      <li><a class="deprecated" href="fake/topLevelFunction.html">topLevelFunction</a></li>
+      <li><a href="fake/typeParamOfFutureOr.html">typeParamOfFutureOr</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#enums">Enums</a></li>
+      <li><a href="fake/Color-class.html">Color</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#typedefs">Typedefs</a></li>
+      <li><a href="fake/Callback2.html">Callback2</a></li>
+      <li><a class="deprecated" href="fake/FakeProcesses.html">FakeProcesses</a></li>
+      <li><a href="fake/GenericTypedef.html">GenericTypedef</a></li>
+      <li><a href="fake/LotsAndLotsOfParameters.html">LotsAndLotsOfParameters</a></li>
+      <li><a href="fake/myCoolTypedef.html">myCoolTypedef</a></li>
+      <li><a href="fake/NewGenericTypedef.html">NewGenericTypedef</a></li>
+      <li><a href="fake/VoidCallback.html">VoidCallback</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#exceptions">Exceptions</a></li>
+      <li><a class="deprecated" href="fake/Doh-class.html">Doh</a></li>
+      <li><a href="fake/Oops-class.html">Oops</a></li>
+    </ol>
+  </div>
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+      <h1>AClassUsingNewStyleMixin class </h1>
+
+    <section class="desc markdown">
+      <p>A class mixing in a single new-style mixin.</p>
+    </section>
+    
+    <section>
+      <dl class="dl-horizontal">
+        <dt>Inheritance</dt>
+        <dd><ul class="gt-separated dark clazz-relationships">
+          <li>Object</li>
+          <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
+          <li>AClassUsingNewStyleMixin</li>
+        </ul></dd>
+
+
+        <dt>Mixed in types</dt>
+        <dd><ul class="comma-separated clazz-relationships">
+          <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+        </ul></dd>
+
+
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor" id="constructors">
+      <h2>Constructors</h2>
+
+      <dl class="constructor-summary-list">
+        <dt id="AClassUsingNewStyleMixin" class="callable">
+          <span class="name"><a href="fake/AClassUsingNewStyleMixin/AClassUsingNewStyleMixin.html">AClassUsingNewStyleMixin</a></span><span class="signature">()</span>
+        </dt>
+        <dd>
+          
+        </dd>
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor inherited" id="instance-properties">
+      <h2>Properties</h2>
+
+      <dl class="properties">
+        <dt id="hashCode" class="property inherited">
+          <span class="name"><a href="fake/NotAMixin/hashCode.html">hashCode</a></span>
+          <span class="signature">&#8594; int</span> 
+        </dt>
+        <dd class="inherited">
+          
+          <div class="features">read-only, inherited</div>
+</dd>
+        <dt id="runtimeType" class="property inherited">
+          <span class="name"><a href="fake/NotAMixin/runtimeType.html">runtimeType</a></span>
+          <span class="signature">&#8594; Type</span> 
+        </dt>
+        <dd class="inherited">
+          
+          <div class="features">read-only, inherited</div>
+</dd>
+        <dt id="superString" class="property inherited">
+          <span class="name"><a href="fake/NewStyleMixinCallingSuper/superString.html">superString</a></span>
+          <span class="signature">&#8594; String</span> 
+        </dt>
+        <dd class="inherited">
+          I have documentation for an overridden method named <a href="fake/NewStyleMixinCallingSuper/superString.html">superString</a>,
+different from <a href="fake/NotAMixin/superString.html">NotAMixin.superString</a>.
+          <div class="features">read-only, inherited</div>
+</dd>
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor inherited" id="instance-methods">
+      <h2>Methods</h2>
+      <dl class="callables">
+        <dt id="noSuchMethod" class="callable inherited">
+          <span class="name"><a href="fake/NotAMixin/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
+            <span class="returntype parameter">&#8594; dynamic</span>
+          </span>
+          </dt>
+        <dd class="inherited">
+          
+          <div class="features">inherited</div>
+</dd>
+        <dt id="toString" class="callable inherited">
+          <span class="name"><a href="fake/NotAMixin/toString.html">toString</a></span><span class="signature">(<wbr>)
+            <span class="returntype parameter">&#8594; String</span>
+          </span>
+          </dt>
+        <dd class="inherited">
+          
+          <div class="features">inherited</div>
+</dd>
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor inherited" id="operators">
+      <h2>Operators</h2>
+      <dl class="callables">
+        <dt id="operator ==" class="callable inherited">
+          <span class="name"><a href="fake/NotAMixin/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
+            <span class="returntype parameter">&#8594; bool</span>
+          </span>
+          </dt>
+        <dd class="inherited">
+          
+          <div class="features">inherited</div>
+</dd>
+      </dl>
+    </section>
+
+
+
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+    <ol>
+      <li class="section-title"><a href="fake/AClassUsingNewStyleMixin-class.html#constructors">Constructors</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin/AClassUsingNewStyleMixin.html">AClassUsingNewStyleMixin</a></li>
+    
+      <li class="section-title inherited">
+        <a href="fake/AClassUsingNewStyleMixin-class.html#instance-properties">Properties</a>
+      </li>
+      <li class="inherited"><a href="fake/NotAMixin/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/NotAMixin/runtimeType.html">runtimeType</a></li>
+      <li class="inherited"><a href="fake/NewStyleMixinCallingSuper/superString.html">superString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/AClassUsingNewStyleMixin-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/NotAMixin/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/NotAMixin/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/AClassUsingNewStyleMixin-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/NotAMixin/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs/fake/AClassUsingNewStyleMixin/AClassUsingNewStyleMixin.html b/testing/test_package_docs/fake/AClassUsingNewStyleMixin/AClassUsingNewStyleMixin.html
new file mode 100644
index 0000000000..c8750dfc13
--- /dev/null
+++ b/testing/test_package_docs/fake/AClassUsingNewStyleMixin/AClassUsingNewStyleMixin.html
@@ -0,0 +1,98 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the AClassUsingNewStyleMixin constructor from the Class AClassUsingNewStyleMixin class from the fake library, for the Dart programming language.">
+  <title>AClassUsingNewStyleMixin constructor - AClassUsingNewStyleMixin class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
+    <li class="self-crumb">AClassUsingNewStyleMixin constructor</li>
+  </ol>
+  <div class="self-name">AClassUsingNewStyleMixin</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>AClassUsingNewStyleMixin class</h5>
+    <ol>
+      <li class="section-title"><a href="fake/AClassUsingNewStyleMixin-class.html#constructors">Constructors</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin/AClassUsingNewStyleMixin.html">AClassUsingNewStyleMixin</a></li>
+    
+      <li class="section-title inherited">
+        <a href="fake/AClassUsingNewStyleMixin-class.html#instance-properties">Properties</a>
+      </li>
+      <li class="inherited"><a href="fake/NotAMixin/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/NotAMixin/runtimeType.html">runtimeType</a></li>
+      <li class="inherited"><a href="fake/NewStyleMixinCallingSuper/superString.html">superString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/AClassUsingNewStyleMixin-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/NotAMixin/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/NotAMixin/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/AClassUsingNewStyleMixin-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/NotAMixin/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-left-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>AClassUsingNewStyleMixin constructor</h1>
+
+    <section class="multi-line-signature">
+      
+      <span class="name ">AClassUsingNewStyleMixin</span>(<wbr>)
+    </section>
+
+    
+    
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs/fake/AClassWithFancyProperties-class.html b/testing/test_package_docs/fake/AClassWithFancyProperties-class.html
index a20883841f..3371adde0b 100644
--- a/testing/test_package_docs/fake/AClassWithFancyProperties-class.html
+++ b/testing/test_package_docs/fake/AClassWithFancyProperties-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/AMixinCallingSuper-class.html b/testing/test_package_docs/fake/AMixinCallingSuper-class.html
index 22fff0f308..07c98fcb90 100644
--- a/testing/test_package_docs/fake/AMixinCallingSuper-class.html
+++ b/testing/test_package_docs/fake/AMixinCallingSuper-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/ATypeTakingClass-class.html b/testing/test_package_docs/fake/ATypeTakingClass-class.html
index a9fda66640..6ef98a1d28 100644
--- a/testing/test_package_docs/fake/ATypeTakingClass-class.html
+++ b/testing/test_package_docs/fake/ATypeTakingClass-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/ATypeTakingClassMixedIn-class.html b/testing/test_package_docs/fake/ATypeTakingClassMixedIn-class.html
index dbfba684f5..b5593a51ff 100644
--- a/testing/test_package_docs/fake/ATypeTakingClassMixedIn-class.html
+++ b/testing/test_package_docs/fake/ATypeTakingClassMixedIn-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/Annotation-class.html b/testing/test_package_docs/fake/Annotation-class.html
index 40b93946cf..d06d9a42fc 100644
--- a/testing/test_package_docs/fake/Annotation-class.html
+++ b/testing/test_package_docs/fake/Annotation-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/AnotherInterface-class.html b/testing/test_package_docs/fake/AnotherInterface-class.html
index 52dc332346..ab3f4174da 100644
--- a/testing/test_package_docs/fake/AnotherInterface-class.html
+++ b/testing/test_package_docs/fake/AnotherInterface-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/BaseForDocComments-class.html b/testing/test_package_docs/fake/BaseForDocComments-class.html
index b0f7d74f57..984513514e 100644
--- a/testing/test_package_docs/fake/BaseForDocComments-class.html
+++ b/testing/test_package_docs/fake/BaseForDocComments-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/BaseThingy-class.html b/testing/test_package_docs/fake/BaseThingy-class.html
index 2063ccc867..2302bb6399 100644
--- a/testing/test_package_docs/fake/BaseThingy-class.html
+++ b/testing/test_package_docs/fake/BaseThingy-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/BaseThingy2-class.html b/testing/test_package_docs/fake/BaseThingy2-class.html
index d65ed39c91..d277d75ab6 100644
--- a/testing/test_package_docs/fake/BaseThingy2-class.html
+++ b/testing/test_package_docs/fake/BaseThingy2-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/CUSTOM_CLASS-constant.html b/testing/test_package_docs/fake/CUSTOM_CLASS-constant.html
index 8eb56be916..2474f645eb 100644
--- a/testing/test_package_docs/fake/CUSTOM_CLASS-constant.html
+++ b/testing/test_package_docs/fake/CUSTOM_CLASS-constant.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/CUSTOM_CLASS_PRIVATE-constant.html b/testing/test_package_docs/fake/CUSTOM_CLASS_PRIVATE-constant.html
index 94e604c0d0..d9a3e482c1 100644
--- a/testing/test_package_docs/fake/CUSTOM_CLASS_PRIVATE-constant.html
+++ b/testing/test_package_docs/fake/CUSTOM_CLASS_PRIVATE-constant.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/Callback2.html b/testing/test_package_docs/fake/Callback2.html
index 21dd36c16c..733174aac1 100644
--- a/testing/test_package_docs/fake/Callback2.html
+++ b/testing/test_package_docs/fake/Callback2.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/ClassWithUnusualProperties-class.html b/testing/test_package_docs/fake/ClassWithUnusualProperties-class.html
index c02a13fcfe..c103d1604b 100644
--- a/testing/test_package_docs/fake/ClassWithUnusualProperties-class.html
+++ b/testing/test_package_docs/fake/ClassWithUnusualProperties-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/Color-class.html b/testing/test_package_docs/fake/Color-class.html
index 5d74055e04..0eab08c62f 100644
--- a/testing/test_package_docs/fake/Color-class.html
+++ b/testing/test_package_docs/fake/Color-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/ConstantClass-class.html b/testing/test_package_docs/fake/ConstantClass-class.html
index 94a494fb7f..6878764acf 100644
--- a/testing/test_package_docs/fake/ConstantClass-class.html
+++ b/testing/test_package_docs/fake/ConstantClass-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/ConstructorTester-class.html b/testing/test_package_docs/fake/ConstructorTester-class.html
index 71beb6c9a8..cc9f6f6e3f 100644
--- a/testing/test_package_docs/fake/ConstructorTester-class.html
+++ b/testing/test_package_docs/fake/ConstructorTester-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/Cool-class.html b/testing/test_package_docs/fake/Cool-class.html
index 7ef6fe31bf..da4ec2ef11 100644
--- a/testing/test_package_docs/fake/Cool-class.html
+++ b/testing/test_package_docs/fake/Cool-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/DOWN-constant.html b/testing/test_package_docs/fake/DOWN-constant.html
index 1831af6791..fbdf501356 100644
--- a/testing/test_package_docs/fake/DOWN-constant.html
+++ b/testing/test_package_docs/fake/DOWN-constant.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/DocumentWithATable-class.html b/testing/test_package_docs/fake/DocumentWithATable-class.html
index e7892023ad..2bb1abb709 100644
--- a/testing/test_package_docs/fake/DocumentWithATable-class.html
+++ b/testing/test_package_docs/fake/DocumentWithATable-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/Doh-class.html b/testing/test_package_docs/fake/Doh-class.html
index e7b4c98863..f1265becaa 100644
--- a/testing/test_package_docs/fake/Doh-class.html
+++ b/testing/test_package_docs/fake/Doh-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/ExtendsFutureVoid-class.html b/testing/test_package_docs/fake/ExtendsFutureVoid-class.html
index 90f28ea278..2e46159064 100644
--- a/testing/test_package_docs/fake/ExtendsFutureVoid-class.html
+++ b/testing/test_package_docs/fake/ExtendsFutureVoid-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/ExtraSpecialList-class.html b/testing/test_package_docs/fake/ExtraSpecialList-class.html
index 8b71cb0cb5..6e40fe2ef5 100644
--- a/testing/test_package_docs/fake/ExtraSpecialList-class.html
+++ b/testing/test_package_docs/fake/ExtraSpecialList-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
@@ -171,7 +179,7 @@ <h1>ExtraSpecialList&lt;<wbr><span class="type-parameter">E</span>&gt; class </h
         <dt>Inheritance</dt>
         <dd><ul class="gt-separated dark clazz-relationships">
           <li>Object</li>
-          <li>ListBase<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></li>
+          <li>ListBase</li>
           <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
           <li>ExtraSpecialList</li>
         </ul></dd>
diff --git a/testing/test_package_docs/fake/FakeProcesses.html b/testing/test_package_docs/fake/FakeProcesses.html
index eb04ef9ccb..47de59db4c 100644
--- a/testing/test_package_docs/fake/FakeProcesses.html
+++ b/testing/test_package_docs/fake/FakeProcesses.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/Foo2-class.html b/testing/test_package_docs/fake/Foo2-class.html
index 4ed3474062..33426ceb87 100644
--- a/testing/test_package_docs/fake/Foo2-class.html
+++ b/testing/test_package_docs/fake/Foo2-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/GenericClass-class.html b/testing/test_package_docs/fake/GenericClass-class.html
new file mode 100644
index 0000000000..68ee09a62d
--- /dev/null
+++ b/testing/test_package_docs/fake/GenericClass-class.html
@@ -0,0 +1,356 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the GenericClass class from the fake library, for the Dart programming language.">
+  <title>GenericClass class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li class="self-crumb">GenericClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span> class</li>
+  </ol>
+  <div class="self-name">GenericClass</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>fake library</h5>
+    <ol>
+      <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
+      <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
+      <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
+      <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
+      <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
+      <li><a href="fake/Annotation-class.html">Annotation</a></li>
+      <li><a href="fake/AnotherInterface-class.html">AnotherInterface</a></li>
+      <li><a href="fake/ATypeTakingClass-class.html">ATypeTakingClass</a></li>
+      <li><a href="fake/ATypeTakingClassMixedIn-class.html">ATypeTakingClassMixedIn</a></li>
+      <li><a href="fake/BaseForDocComments-class.html">BaseForDocComments</a></li>
+      <li><a href="fake/BaseThingy-class.html">BaseThingy</a></li>
+      <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
+      <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
+      <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
+      <li><a href="fake/Cool-class.html">Cool</a></li>
+      <li><a href="fake/DocumentWithATable-class.html">DocumentWithATable</a></li>
+      <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
+      <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
+      <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
+      <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
+      <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
+      <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
+      <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
+      <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
+      <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
+      <li><a href="fake/ImplicitProperties-class.html">ImplicitProperties</a></li>
+      <li><a href="fake/InheritingClassOne-class.html">InheritingClassOne</a></li>
+      <li><a href="fake/InheritingClassTwo-class.html">InheritingClassTwo</a></li>
+      <li><a href="fake/Interface-class.html">Interface</a></li>
+      <li><a href="fake/LongFirstLine-class.html">LongFirstLine</a></li>
+      <li><a href="fake/MIEEBase-class.html">MIEEBase</a></li>
+      <li><a href="fake/MIEEMixin-class.html">MIEEMixin</a></li>
+      <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
+      <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
+      <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
+      <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
+      <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
+      <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
+      <li><a href="fake/ReferringClass-class.html">ReferringClass</a></li>
+      <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+      <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
+      <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
+      <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
+      <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
+      <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
+      <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
+      <li><a href="fake/CUSTOM_CLASS_PRIVATE-constant.html">CUSTOM_CLASS_PRIVATE</a></li>
+      <li><a class="deprecated" href="fake/DOWN-constant.html">DOWN</a></li>
+      <li><a href="fake/greatAnnotation-constant.html">greatAnnotation</a></li>
+      <li><a href="fake/greatestAnnotation-constant.html">greatestAnnotation</a></li>
+      <li><a href="fake/incorrectDocReference-constant.html">incorrectDocReference</a></li>
+      <li><a href="fake/myMap-constant.html">myMap</a></li>
+      <li><a href="fake/NAME_SINGLEUNDERSCORE-constant.html">NAME_SINGLEUNDERSCORE</a></li>
+      <li><a href="fake/NAME_WITH_TWO_UNDERSCORES-constant.html">NAME_WITH_TWO_UNDERSCORES</a></li>
+      <li><a href="fake/PI-constant.html">PI</a></li>
+      <li><a href="fake/required-constant.html">required</a></li>
+      <li><a href="fake/testingCodeSyntaxInOneLiners-constant.html">testingCodeSyntaxInOneLiners</a></li>
+      <li><a href="fake/UP-constant.html">UP</a></li>
+      <li><a href="fake/ZERO-constant.html">ZERO</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
+      <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
+      <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
+      <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
+      <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
+      <li><a href="fake/justGetter.html">justGetter</a></li>
+      <li><a href="fake/justSetter.html">justSetter</a></li>
+      <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
+      <li><a class="deprecated" href="fake/meaningOfLife.html">meaningOfLife</a></li>
+      <li><a href="fake/mustGetThis.html">mustGetThis</a></li>
+      <li><a href="fake/setAndGet.html">setAndGet</a></li>
+      <li><a href="fake/simpleProperty.html">simpleProperty</a></li>
+      <li><a href="fake/useSomethingInAnotherPackage.html">useSomethingInAnotherPackage</a></li>
+      <li><a href="fake/useSomethingInTheSdk.html">useSomethingInTheSdk</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#functions">Functions</a></li>
+      <li><a href="fake/addCallback.html">addCallback</a></li>
+      <li><a href="fake/addCallback2.html">addCallback2</a></li>
+      <li><a href="fake/aVoidParameter.html">aVoidParameter</a></li>
+      <li><a href="fake/functionWithFunctionParameters.html">functionWithFunctionParameters</a></li>
+      <li><a href="fake/myGenericFunction.html">myGenericFunction</a></li>
+      <li><a href="fake/onlyPositionalWithNoDefaultNoType.html">onlyPositionalWithNoDefaultNoType</a></li>
+      <li><a href="fake/paintImage1.html">paintImage1</a></li>
+      <li><a href="fake/paintImage2.html">paintImage2</a></li>
+      <li><a href="fake/paramFromAnotherLib.html">paramFromAnotherLib</a></li>
+      <li><a href="fake/paramOfFutureOrNull.html">paramOfFutureOrNull</a></li>
+      <li><a href="fake/returningFutureVoid.html">returningFutureVoid</a></li>
+      <li><a href="fake/short.html">short</a></li>
+      <li><a href="fake/soIntense.html">soIntense</a></li>
+      <li><a href="fake/thisIsAlsoAsync.html">thisIsAlsoAsync</a></li>
+      <li><a href="fake/thisIsAsync.html">thisIsAsync</a></li>
+      <li><a href="fake/thisIsFutureOr.html">thisIsFutureOr</a></li>
+      <li><a href="fake/thisIsFutureOrNull.html">thisIsFutureOrNull</a></li>
+      <li><a href="fake/thisIsFutureOrT.html">thisIsFutureOrT</a></li>
+      <li><a class="deprecated" href="fake/topLevelFunction.html">topLevelFunction</a></li>
+      <li><a href="fake/typeParamOfFutureOr.html">typeParamOfFutureOr</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#enums">Enums</a></li>
+      <li><a href="fake/Color-class.html">Color</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#typedefs">Typedefs</a></li>
+      <li><a href="fake/Callback2.html">Callback2</a></li>
+      <li><a class="deprecated" href="fake/FakeProcesses.html">FakeProcesses</a></li>
+      <li><a href="fake/GenericTypedef.html">GenericTypedef</a></li>
+      <li><a href="fake/LotsAndLotsOfParameters.html">LotsAndLotsOfParameters</a></li>
+      <li><a href="fake/myCoolTypedef.html">myCoolTypedef</a></li>
+      <li><a href="fake/NewGenericTypedef.html">NewGenericTypedef</a></li>
+      <li><a href="fake/VoidCallback.html">VoidCallback</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#exceptions">Exceptions</a></li>
+      <li><a class="deprecated" href="fake/Doh-class.html">Doh</a></li>
+      <li><a href="fake/Oops-class.html">Oops</a></li>
+    </ol>
+  </div>
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+      <h1>GenericClass&lt;<wbr><span class="type-parameter">T</span>&gt; class </h1>
+
+    <section class="desc markdown">
+      <p>A generic class for testing type inference.</p>
+    </section>
+    
+    <section>
+      <dl class="dl-horizontal">
+
+
+
+        <dt>Implementers</dt>
+        <dd><ul class="comma-separated clazz-relationships">
+          <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
+        </ul></dd>
+
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor" id="constructors">
+      <h2>Constructors</h2>
+
+      <dl class="constructor-summary-list">
+        <dt id="GenericClass" class="callable">
+          <span class="name"><a href="fake/GenericClass/GenericClass.html">GenericClass</a></span><span class="signature">()</span>
+        </dt>
+        <dd>
+          
+        </dd>
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor" id="instance-properties">
+      <h2>Properties</h2>
+
+      <dl class="properties">
+        <dt id="member" class="property">
+          <span class="name"><a href="fake/GenericClass/member.html">member</a></span>
+          <span class="signature">&#8596; T</span> 
+        </dt>
+        <dd>
+          
+          <div class="features">read / write</div>
+</dd>
+        <dt id="overrideByBoth" class="property">
+          <span class="name"><a href="fake/GenericClass/overrideByBoth.html">overrideByBoth</a></span>
+          <span class="signature">&#8596; T</span> 
+        </dt>
+        <dd>
+          Destined to be overridden by <a href="fake/ModifierClass-class.html">ModifierClass</a> and <a href="fake/GenericMixin-mixin.html">GenericMixin</a>, both.
+          <div class="features">read / write</div>
+</dd>
+        <dt id="overrideByEverything" class="property">
+          <span class="name"><a href="fake/GenericClass/overrideByEverything.html">overrideByEverything</a></span>
+          <span class="signature">&#8596; T</span> 
+        </dt>
+        <dd>
+          Destined to be overridden by everything.
+          <div class="features">read / write</div>
+</dd>
+        <dt id="overrideByGenericMixin" class="property">
+          <span class="name"><a href="fake/GenericClass/overrideByGenericMixin.html">overrideByGenericMixin</a></span>
+          <span class="signature">&#8596; T</span> 
+        </dt>
+        <dd>
+          Destined to be overridden by <a href="fake/GenericMixin-mixin.html">GenericMixin</a>.
+          <div class="features">read / write</div>
+</dd>
+        <dt id="overrideByModifierClass" class="property">
+          <span class="name"><a href="fake/GenericClass/overrideByModifierClass.html">overrideByModifierClass</a></span>
+          <span class="signature">&#8596; T</span> 
+        </dt>
+        <dd>
+          Destined to be overridden by <a href="fake/ModifierClass-class.html">ModifierClass</a>.
+          <div class="features">read / write</div>
+</dd>
+        <dt id="hashCode" class="property inherited">
+          <span class="name"><a href="fake/GenericClass/hashCode.html">hashCode</a></span>
+          <span class="signature">&#8594; int</span> 
+        </dt>
+        <dd class="inherited">
+          
+          <div class="features">read-only, inherited</div>
+</dd>
+        <dt id="runtimeType" class="property inherited">
+          <span class="name"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></span>
+          <span class="signature">&#8594; Type</span> 
+        </dt>
+        <dd class="inherited">
+          
+          <div class="features">read-only, inherited</div>
+</dd>
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor inherited" id="instance-methods">
+      <h2>Methods</h2>
+      <dl class="callables">
+        <dt id="noSuchMethod" class="callable inherited">
+          <span class="name"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
+            <span class="returntype parameter">&#8594; dynamic</span>
+          </span>
+          </dt>
+        <dd class="inherited">
+          
+          <div class="features">inherited</div>
+</dd>
+        <dt id="toString" class="callable inherited">
+          <span class="name"><a href="fake/GenericClass/toString.html">toString</a></span><span class="signature">(<wbr>)
+            <span class="returntype parameter">&#8594; String</span>
+          </span>
+          </dt>
+        <dd class="inherited">
+          
+          <div class="features">inherited</div>
+</dd>
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor inherited" id="operators">
+      <h2>Operators</h2>
+      <dl class="callables">
+        <dt id="operator ==" class="callable inherited">
+          <span class="name"><a href="fake/GenericClass/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
+            <span class="returntype parameter">&#8594; bool</span>
+          </span>
+          </dt>
+        <dd class="inherited">
+          
+          <div class="features">inherited</div>
+</dd>
+      </dl>
+    </section>
+
+
+
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+    <ol>
+      <li class="section-title"><a href="fake/GenericClass-class.html#constructors">Constructors</a></li>
+      <li><a href="fake/GenericClass/GenericClass.html">GenericClass</a></li>
+    
+      <li class="section-title">
+        <a href="fake/GenericClass-class.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/GenericClass/member.html">member</a></li>
+      <li><a href="fake/GenericClass/overrideByBoth.html">overrideByBoth</a></li>
+      <li><a href="fake/GenericClass/overrideByEverything.html">overrideByEverything</a></li>
+      <li><a href="fake/GenericClass/overrideByGenericMixin.html">overrideByGenericMixin</a></li>
+      <li><a href="fake/GenericClass/overrideByModifierClass.html">overrideByModifierClass</a></li>
+      <li class="inherited"><a href="fake/GenericClass/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericClass-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/GenericClass/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericClass-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/GenericClass/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs/fake/GenericClass/GenericClass.html b/testing/test_package_docs/fake/GenericClass/GenericClass.html
new file mode 100644
index 0000000000..c960cf26c6
--- /dev/null
+++ b/testing/test_package_docs/fake/GenericClass/GenericClass.html
@@ -0,0 +1,102 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the GenericClass constructor from the Class GenericClass class from the fake library, for the Dart programming language.">
+  <title>GenericClass constructor - GenericClass class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/GenericClass-class.html">GenericClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
+    <li class="self-crumb">GenericClass constructor</li>
+  </ol>
+  <div class="self-name">GenericClass</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>GenericClass class</h5>
+    <ol>
+      <li class="section-title"><a href="fake/GenericClass-class.html#constructors">Constructors</a></li>
+      <li><a href="fake/GenericClass/GenericClass.html">GenericClass</a></li>
+    
+      <li class="section-title">
+        <a href="fake/GenericClass-class.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/GenericClass/member.html">member</a></li>
+      <li><a href="fake/GenericClass/overrideByBoth.html">overrideByBoth</a></li>
+      <li><a href="fake/GenericClass/overrideByEverything.html">overrideByEverything</a></li>
+      <li><a href="fake/GenericClass/overrideByGenericMixin.html">overrideByGenericMixin</a></li>
+      <li><a href="fake/GenericClass/overrideByModifierClass.html">overrideByModifierClass</a></li>
+      <li class="inherited"><a href="fake/GenericClass/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericClass-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/GenericClass/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericClass-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/GenericClass/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-left-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>GenericClass&lt;<wbr><span class="type-parameter">T</span>&gt; constructor</h1>
+
+    <section class="multi-line-signature">
+      
+      <span class="name ">GenericClass&lt;<wbr><span class="type-parameter">T</span>&gt;</span>(<wbr>)
+    </section>
+
+    
+    
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs/fake/GenericClass/hashCode.html b/testing/test_package_docs/fake/GenericClass/hashCode.html
new file mode 100644
index 0000000000..01339153d1
--- /dev/null
+++ b/testing/test_package_docs/fake/GenericClass/hashCode.html
@@ -0,0 +1,106 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the hashCode property from the GenericClass class, for the Dart programming language.">
+  <title>hashCode property - GenericClass class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/GenericClass-class.html">GenericClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
+    <li class="self-crumb">hashCode property</li>
+  </ol>
+  <div class="self-name">hashCode</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>GenericClass class</h5>
+    <ol>
+      <li class="section-title"><a href="fake/GenericClass-class.html#constructors">Constructors</a></li>
+      <li><a href="fake/GenericClass/GenericClass.html">GenericClass</a></li>
+    
+      <li class="section-title">
+        <a href="fake/GenericClass-class.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/GenericClass/member.html">member</a></li>
+      <li><a href="fake/GenericClass/overrideByBoth.html">overrideByBoth</a></li>
+      <li><a href="fake/GenericClass/overrideByEverything.html">overrideByEverything</a></li>
+      <li><a href="fake/GenericClass/overrideByGenericMixin.html">overrideByGenericMixin</a></li>
+      <li><a href="fake/GenericClass/overrideByModifierClass.html">overrideByModifierClass</a></li>
+      <li class="inherited"><a href="fake/GenericClass/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericClass-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/GenericClass/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericClass-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/GenericClass/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
+
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>
+  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs/fake/GenericClass/member.html b/testing/test_package_docs/fake/GenericClass/member.html
new file mode 100644
index 0000000000..8bc1527566
--- /dev/null
+++ b/testing/test_package_docs/fake/GenericClass/member.html
@@ -0,0 +1,101 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the member property from the GenericClass class, for the Dart programming language.">
+  <title>member property - GenericClass class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/GenericClass-class.html">GenericClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
+    <li class="self-crumb">member property</li>
+  </ol>
+  <div class="self-name">member</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>GenericClass class</h5>
+    <ol>
+      <li class="section-title"><a href="fake/GenericClass-class.html#constructors">Constructors</a></li>
+      <li><a href="fake/GenericClass/GenericClass.html">GenericClass</a></li>
+    
+      <li class="section-title">
+        <a href="fake/GenericClass-class.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/GenericClass/member.html">member</a></li>
+      <li><a href="fake/GenericClass/overrideByBoth.html">overrideByBoth</a></li>
+      <li><a href="fake/GenericClass/overrideByEverything.html">overrideByEverything</a></li>
+      <li><a href="fake/GenericClass/overrideByGenericMixin.html">overrideByGenericMixin</a></li>
+      <li><a href="fake/GenericClass/overrideByModifierClass.html">overrideByModifierClass</a></li>
+      <li class="inherited"><a href="fake/GenericClass/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericClass-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/GenericClass/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericClass-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/GenericClass/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>member property</h1>
+
+        <section class="multi-line-signature">
+          <span class="returntype">T</span>
+          <span class="name ">member</span>
+          <div class="features">read / write</div>
+        </section>
+                
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs/fake/GenericClass/noSuchMethod.html b/testing/test_package_docs/fake/GenericClass/noSuchMethod.html
new file mode 100644
index 0000000000..d703b87477
--- /dev/null
+++ b/testing/test_package_docs/fake/GenericClass/noSuchMethod.html
@@ -0,0 +1,102 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the noSuchMethod method from the GenericClass class, for the Dart programming language.">
+  <title>noSuchMethod method - GenericClass class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/GenericClass-class.html">GenericClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
+    <li class="self-crumb">noSuchMethod method</li>
+  </ol>
+  <div class="self-name">noSuchMethod</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>GenericClass class</h5>
+    <ol>
+      <li class="section-title"><a href="fake/GenericClass-class.html#constructors">Constructors</a></li>
+      <li><a href="fake/GenericClass/GenericClass.html">GenericClass</a></li>
+    
+      <li class="section-title">
+        <a href="fake/GenericClass-class.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/GenericClass/member.html">member</a></li>
+      <li><a href="fake/GenericClass/overrideByBoth.html">overrideByBoth</a></li>
+      <li><a href="fake/GenericClass/overrideByEverything.html">overrideByEverything</a></li>
+      <li><a href="fake/GenericClass/overrideByGenericMixin.html">overrideByGenericMixin</a></li>
+      <li><a href="fake/GenericClass/overrideByModifierClass.html">overrideByModifierClass</a></li>
+      <li class="inherited"><a href="fake/GenericClass/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericClass-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/GenericClass/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericClass-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/GenericClass/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
+    <section class="multi-line-signature">
+      <span class="returntype">dynamic</span>
+      <span class="name ">noSuchMethod</span>
+(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
+    </section>
+    
+    
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs/fake/GenericClass/operator_equals.html b/testing/test_package_docs/fake/GenericClass/operator_equals.html
new file mode 100644
index 0000000000..c1ce12e3c8
--- /dev/null
+++ b/testing/test_package_docs/fake/GenericClass/operator_equals.html
@@ -0,0 +1,102 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the operator == method from the GenericClass class, for the Dart programming language.">
+  <title>operator == method - GenericClass class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/GenericClass-class.html">GenericClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
+    <li class="self-crumb">operator == method</li>
+  </ol>
+  <div class="self-name">operator ==</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>GenericClass class</h5>
+    <ol>
+      <li class="section-title"><a href="fake/GenericClass-class.html#constructors">Constructors</a></li>
+      <li><a href="fake/GenericClass/GenericClass.html">GenericClass</a></li>
+    
+      <li class="section-title">
+        <a href="fake/GenericClass-class.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/GenericClass/member.html">member</a></li>
+      <li><a href="fake/GenericClass/overrideByBoth.html">overrideByBoth</a></li>
+      <li><a href="fake/GenericClass/overrideByEverything.html">overrideByEverything</a></li>
+      <li><a href="fake/GenericClass/overrideByGenericMixin.html">overrideByGenericMixin</a></li>
+      <li><a href="fake/GenericClass/overrideByModifierClass.html">overrideByModifierClass</a></li>
+      <li class="inherited"><a href="fake/GenericClass/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericClass-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/GenericClass/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericClass-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/GenericClass/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
+    <section class="multi-line-signature">
+      <span class="returntype">bool</span>
+      <span class="name ">operator ==</span>
+(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
+    </section>
+    
+    
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs/fake/GenericClass/overrideByBoth.html b/testing/test_package_docs/fake/GenericClass/overrideByBoth.html
new file mode 100644
index 0000000000..106986ef9f
--- /dev/null
+++ b/testing/test_package_docs/fake/GenericClass/overrideByBoth.html
@@ -0,0 +1,104 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the overrideByBoth property from the GenericClass class, for the Dart programming language.">
+  <title>overrideByBoth property - GenericClass class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/GenericClass-class.html">GenericClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
+    <li class="self-crumb">overrideByBoth property</li>
+  </ol>
+  <div class="self-name">overrideByBoth</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>GenericClass class</h5>
+    <ol>
+      <li class="section-title"><a href="fake/GenericClass-class.html#constructors">Constructors</a></li>
+      <li><a href="fake/GenericClass/GenericClass.html">GenericClass</a></li>
+    
+      <li class="section-title">
+        <a href="fake/GenericClass-class.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/GenericClass/member.html">member</a></li>
+      <li><a href="fake/GenericClass/overrideByBoth.html">overrideByBoth</a></li>
+      <li><a href="fake/GenericClass/overrideByEverything.html">overrideByEverything</a></li>
+      <li><a href="fake/GenericClass/overrideByGenericMixin.html">overrideByGenericMixin</a></li>
+      <li><a href="fake/GenericClass/overrideByModifierClass.html">overrideByModifierClass</a></li>
+      <li class="inherited"><a href="fake/GenericClass/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericClass-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/GenericClass/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericClass-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/GenericClass/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>overrideByBoth property</h1>
+
+        <section class="multi-line-signature">
+          <span class="returntype">T</span>
+          <span class="name ">overrideByBoth</span>
+          <div class="features">read / write</div>
+        </section>
+        <section class="desc markdown">
+          <p>Destined to be overridden by <a href="fake/ModifierClass-class.html">ModifierClass</a> and <a href="fake/GenericMixin-mixin.html">GenericMixin</a>, both.</p>
+        </section>
+                
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs/fake/GenericClass/overrideByEverything.html b/testing/test_package_docs/fake/GenericClass/overrideByEverything.html
new file mode 100644
index 0000000000..a22518f730
--- /dev/null
+++ b/testing/test_package_docs/fake/GenericClass/overrideByEverything.html
@@ -0,0 +1,104 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the overrideByEverything property from the GenericClass class, for the Dart programming language.">
+  <title>overrideByEverything property - GenericClass class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/GenericClass-class.html">GenericClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
+    <li class="self-crumb">overrideByEverything property</li>
+  </ol>
+  <div class="self-name">overrideByEverything</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>GenericClass class</h5>
+    <ol>
+      <li class="section-title"><a href="fake/GenericClass-class.html#constructors">Constructors</a></li>
+      <li><a href="fake/GenericClass/GenericClass.html">GenericClass</a></li>
+    
+      <li class="section-title">
+        <a href="fake/GenericClass-class.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/GenericClass/member.html">member</a></li>
+      <li><a href="fake/GenericClass/overrideByBoth.html">overrideByBoth</a></li>
+      <li><a href="fake/GenericClass/overrideByEverything.html">overrideByEverything</a></li>
+      <li><a href="fake/GenericClass/overrideByGenericMixin.html">overrideByGenericMixin</a></li>
+      <li><a href="fake/GenericClass/overrideByModifierClass.html">overrideByModifierClass</a></li>
+      <li class="inherited"><a href="fake/GenericClass/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericClass-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/GenericClass/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericClass-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/GenericClass/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>overrideByEverything property</h1>
+
+        <section class="multi-line-signature">
+          <span class="returntype">T</span>
+          <span class="name ">overrideByEverything</span>
+          <div class="features">read / write</div>
+        </section>
+        <section class="desc markdown">
+          <p>Destined to be overridden by everything.</p>
+        </section>
+                
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs/fake/GenericClass/overrideByGenericMixin.html b/testing/test_package_docs/fake/GenericClass/overrideByGenericMixin.html
new file mode 100644
index 0000000000..8258d2498b
--- /dev/null
+++ b/testing/test_package_docs/fake/GenericClass/overrideByGenericMixin.html
@@ -0,0 +1,104 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the overrideByGenericMixin property from the GenericClass class, for the Dart programming language.">
+  <title>overrideByGenericMixin property - GenericClass class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/GenericClass-class.html">GenericClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
+    <li class="self-crumb">overrideByGenericMixin property</li>
+  </ol>
+  <div class="self-name">overrideByGenericMixin</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>GenericClass class</h5>
+    <ol>
+      <li class="section-title"><a href="fake/GenericClass-class.html#constructors">Constructors</a></li>
+      <li><a href="fake/GenericClass/GenericClass.html">GenericClass</a></li>
+    
+      <li class="section-title">
+        <a href="fake/GenericClass-class.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/GenericClass/member.html">member</a></li>
+      <li><a href="fake/GenericClass/overrideByBoth.html">overrideByBoth</a></li>
+      <li><a href="fake/GenericClass/overrideByEverything.html">overrideByEverything</a></li>
+      <li><a href="fake/GenericClass/overrideByGenericMixin.html">overrideByGenericMixin</a></li>
+      <li><a href="fake/GenericClass/overrideByModifierClass.html">overrideByModifierClass</a></li>
+      <li class="inherited"><a href="fake/GenericClass/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericClass-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/GenericClass/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericClass-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/GenericClass/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>overrideByGenericMixin property</h1>
+
+        <section class="multi-line-signature">
+          <span class="returntype">T</span>
+          <span class="name ">overrideByGenericMixin</span>
+          <div class="features">read / write</div>
+        </section>
+        <section class="desc markdown">
+          <p>Destined to be overridden by <a href="fake/GenericMixin-mixin.html">GenericMixin</a>.</p>
+        </section>
+                
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs/fake/GenericClass/overrideByModifierClass.html b/testing/test_package_docs/fake/GenericClass/overrideByModifierClass.html
new file mode 100644
index 0000000000..6753eb826f
--- /dev/null
+++ b/testing/test_package_docs/fake/GenericClass/overrideByModifierClass.html
@@ -0,0 +1,104 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the overrideByModifierClass property from the GenericClass class, for the Dart programming language.">
+  <title>overrideByModifierClass property - GenericClass class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/GenericClass-class.html">GenericClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
+    <li class="self-crumb">overrideByModifierClass property</li>
+  </ol>
+  <div class="self-name">overrideByModifierClass</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>GenericClass class</h5>
+    <ol>
+      <li class="section-title"><a href="fake/GenericClass-class.html#constructors">Constructors</a></li>
+      <li><a href="fake/GenericClass/GenericClass.html">GenericClass</a></li>
+    
+      <li class="section-title">
+        <a href="fake/GenericClass-class.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/GenericClass/member.html">member</a></li>
+      <li><a href="fake/GenericClass/overrideByBoth.html">overrideByBoth</a></li>
+      <li><a href="fake/GenericClass/overrideByEverything.html">overrideByEverything</a></li>
+      <li><a href="fake/GenericClass/overrideByGenericMixin.html">overrideByGenericMixin</a></li>
+      <li><a href="fake/GenericClass/overrideByModifierClass.html">overrideByModifierClass</a></li>
+      <li class="inherited"><a href="fake/GenericClass/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericClass-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/GenericClass/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericClass-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/GenericClass/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>overrideByModifierClass property</h1>
+
+        <section class="multi-line-signature">
+          <span class="returntype">T</span>
+          <span class="name ">overrideByModifierClass</span>
+          <div class="features">read / write</div>
+        </section>
+        <section class="desc markdown">
+          <p>Destined to be overridden by <a href="fake/ModifierClass-class.html">ModifierClass</a>.</p>
+        </section>
+                
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs/fake/GenericClass/runtimeType.html b/testing/test_package_docs/fake/GenericClass/runtimeType.html
new file mode 100644
index 0000000000..255c9e22d5
--- /dev/null
+++ b/testing/test_package_docs/fake/GenericClass/runtimeType.html
@@ -0,0 +1,106 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the runtimeType property from the GenericClass class, for the Dart programming language.">
+  <title>runtimeType property - GenericClass class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/GenericClass-class.html">GenericClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
+    <li class="self-crumb">runtimeType property</li>
+  </ol>
+  <div class="self-name">runtimeType</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>GenericClass class</h5>
+    <ol>
+      <li class="section-title"><a href="fake/GenericClass-class.html#constructors">Constructors</a></li>
+      <li><a href="fake/GenericClass/GenericClass.html">GenericClass</a></li>
+    
+      <li class="section-title">
+        <a href="fake/GenericClass-class.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/GenericClass/member.html">member</a></li>
+      <li><a href="fake/GenericClass/overrideByBoth.html">overrideByBoth</a></li>
+      <li><a href="fake/GenericClass/overrideByEverything.html">overrideByEverything</a></li>
+      <li><a href="fake/GenericClass/overrideByGenericMixin.html">overrideByGenericMixin</a></li>
+      <li><a href="fake/GenericClass/overrideByModifierClass.html">overrideByModifierClass</a></li>
+      <li class="inherited"><a href="fake/GenericClass/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericClass-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/GenericClass/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericClass-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/GenericClass/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
+
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>
+  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs/fake/GenericClass/toString.html b/testing/test_package_docs/fake/GenericClass/toString.html
new file mode 100644
index 0000000000..6d9183380e
--- /dev/null
+++ b/testing/test_package_docs/fake/GenericClass/toString.html
@@ -0,0 +1,102 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the toString method from the GenericClass class, for the Dart programming language.">
+  <title>toString method - GenericClass class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/GenericClass-class.html">GenericClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
+    <li class="self-crumb">toString method</li>
+  </ol>
+  <div class="self-name">toString</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>GenericClass class</h5>
+    <ol>
+      <li class="section-title"><a href="fake/GenericClass-class.html#constructors">Constructors</a></li>
+      <li><a href="fake/GenericClass/GenericClass.html">GenericClass</a></li>
+    
+      <li class="section-title">
+        <a href="fake/GenericClass-class.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/GenericClass/member.html">member</a></li>
+      <li><a href="fake/GenericClass/overrideByBoth.html">overrideByBoth</a></li>
+      <li><a href="fake/GenericClass/overrideByEverything.html">overrideByEverything</a></li>
+      <li><a href="fake/GenericClass/overrideByGenericMixin.html">overrideByGenericMixin</a></li>
+      <li><a href="fake/GenericClass/overrideByModifierClass.html">overrideByModifierClass</a></li>
+      <li class="inherited"><a href="fake/GenericClass/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericClass-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/GenericClass/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericClass-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/GenericClass/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
+    <section class="multi-line-signature">
+      <span class="returntype">String</span>
+      <span class="name ">toString</span>
+(<wbr>)
+    </section>
+    
+    
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs/fake/GenericMixin-mixin.html b/testing/test_package_docs/fake/GenericMixin-mixin.html
new file mode 100644
index 0000000000..abb3df2f53
--- /dev/null
+++ b/testing/test_package_docs/fake/GenericMixin-mixin.html
@@ -0,0 +1,370 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the GenericMixin mixin from the fake library, for the Dart programming language.">
+  <title>GenericMixin mixin - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li class="self-crumb">GenericMixin<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span> mixin</li>
+  </ol>
+  <div class="self-name">GenericMixin</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>fake library</h5>
+    <ol>
+      <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
+      <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
+      <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
+      <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
+      <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
+      <li><a href="fake/Annotation-class.html">Annotation</a></li>
+      <li><a href="fake/AnotherInterface-class.html">AnotherInterface</a></li>
+      <li><a href="fake/ATypeTakingClass-class.html">ATypeTakingClass</a></li>
+      <li><a href="fake/ATypeTakingClassMixedIn-class.html">ATypeTakingClassMixedIn</a></li>
+      <li><a href="fake/BaseForDocComments-class.html">BaseForDocComments</a></li>
+      <li><a href="fake/BaseThingy-class.html">BaseThingy</a></li>
+      <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
+      <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
+      <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
+      <li><a href="fake/Cool-class.html">Cool</a></li>
+      <li><a href="fake/DocumentWithATable-class.html">DocumentWithATable</a></li>
+      <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
+      <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
+      <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
+      <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
+      <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
+      <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
+      <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
+      <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
+      <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
+      <li><a href="fake/ImplicitProperties-class.html">ImplicitProperties</a></li>
+      <li><a href="fake/InheritingClassOne-class.html">InheritingClassOne</a></li>
+      <li><a href="fake/InheritingClassTwo-class.html">InheritingClassTwo</a></li>
+      <li><a href="fake/Interface-class.html">Interface</a></li>
+      <li><a href="fake/LongFirstLine-class.html">LongFirstLine</a></li>
+      <li><a href="fake/MIEEBase-class.html">MIEEBase</a></li>
+      <li><a href="fake/MIEEMixin-class.html">MIEEMixin</a></li>
+      <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
+      <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
+      <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
+      <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
+      <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
+      <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
+      <li><a href="fake/ReferringClass-class.html">ReferringClass</a></li>
+      <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+      <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
+      <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
+      <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
+      <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
+      <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
+      <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
+      <li><a href="fake/CUSTOM_CLASS_PRIVATE-constant.html">CUSTOM_CLASS_PRIVATE</a></li>
+      <li><a class="deprecated" href="fake/DOWN-constant.html">DOWN</a></li>
+      <li><a href="fake/greatAnnotation-constant.html">greatAnnotation</a></li>
+      <li><a href="fake/greatestAnnotation-constant.html">greatestAnnotation</a></li>
+      <li><a href="fake/incorrectDocReference-constant.html">incorrectDocReference</a></li>
+      <li><a href="fake/myMap-constant.html">myMap</a></li>
+      <li><a href="fake/NAME_SINGLEUNDERSCORE-constant.html">NAME_SINGLEUNDERSCORE</a></li>
+      <li><a href="fake/NAME_WITH_TWO_UNDERSCORES-constant.html">NAME_WITH_TWO_UNDERSCORES</a></li>
+      <li><a href="fake/PI-constant.html">PI</a></li>
+      <li><a href="fake/required-constant.html">required</a></li>
+      <li><a href="fake/testingCodeSyntaxInOneLiners-constant.html">testingCodeSyntaxInOneLiners</a></li>
+      <li><a href="fake/UP-constant.html">UP</a></li>
+      <li><a href="fake/ZERO-constant.html">ZERO</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
+      <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
+      <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
+      <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
+      <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
+      <li><a href="fake/justGetter.html">justGetter</a></li>
+      <li><a href="fake/justSetter.html">justSetter</a></li>
+      <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
+      <li><a class="deprecated" href="fake/meaningOfLife.html">meaningOfLife</a></li>
+      <li><a href="fake/mustGetThis.html">mustGetThis</a></li>
+      <li><a href="fake/setAndGet.html">setAndGet</a></li>
+      <li><a href="fake/simpleProperty.html">simpleProperty</a></li>
+      <li><a href="fake/useSomethingInAnotherPackage.html">useSomethingInAnotherPackage</a></li>
+      <li><a href="fake/useSomethingInTheSdk.html">useSomethingInTheSdk</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#functions">Functions</a></li>
+      <li><a href="fake/addCallback.html">addCallback</a></li>
+      <li><a href="fake/addCallback2.html">addCallback2</a></li>
+      <li><a href="fake/aVoidParameter.html">aVoidParameter</a></li>
+      <li><a href="fake/functionWithFunctionParameters.html">functionWithFunctionParameters</a></li>
+      <li><a href="fake/myGenericFunction.html">myGenericFunction</a></li>
+      <li><a href="fake/onlyPositionalWithNoDefaultNoType.html">onlyPositionalWithNoDefaultNoType</a></li>
+      <li><a href="fake/paintImage1.html">paintImage1</a></li>
+      <li><a href="fake/paintImage2.html">paintImage2</a></li>
+      <li><a href="fake/paramFromAnotherLib.html">paramFromAnotherLib</a></li>
+      <li><a href="fake/paramOfFutureOrNull.html">paramOfFutureOrNull</a></li>
+      <li><a href="fake/returningFutureVoid.html">returningFutureVoid</a></li>
+      <li><a href="fake/short.html">short</a></li>
+      <li><a href="fake/soIntense.html">soIntense</a></li>
+      <li><a href="fake/thisIsAlsoAsync.html">thisIsAlsoAsync</a></li>
+      <li><a href="fake/thisIsAsync.html">thisIsAsync</a></li>
+      <li><a href="fake/thisIsFutureOr.html">thisIsFutureOr</a></li>
+      <li><a href="fake/thisIsFutureOrNull.html">thisIsFutureOrNull</a></li>
+      <li><a href="fake/thisIsFutureOrT.html">thisIsFutureOrT</a></li>
+      <li><a class="deprecated" href="fake/topLevelFunction.html">topLevelFunction</a></li>
+      <li><a href="fake/typeParamOfFutureOr.html">typeParamOfFutureOr</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#enums">Enums</a></li>
+      <li><a href="fake/Color-class.html">Color</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#typedefs">Typedefs</a></li>
+      <li><a href="fake/Callback2.html">Callback2</a></li>
+      <li><a class="deprecated" href="fake/FakeProcesses.html">FakeProcesses</a></li>
+      <li><a href="fake/GenericTypedef.html">GenericTypedef</a></li>
+      <li><a href="fake/LotsAndLotsOfParameters.html">LotsAndLotsOfParameters</a></li>
+      <li><a href="fake/myCoolTypedef.html">myCoolTypedef</a></li>
+      <li><a href="fake/NewGenericTypedef.html">NewGenericTypedef</a></li>
+      <li><a href="fake/VoidCallback.html">VoidCallback</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#exceptions">Exceptions</a></li>
+      <li><a class="deprecated" href="fake/Doh-class.html">Doh</a></li>
+      <li><a href="fake/Oops-class.html">Oops</a></li>
+    </ol>
+  </div>
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+      <h1>GenericMixin&lt;<wbr><span class="type-parameter">T</span>&gt; mixin </h1>
+
+    <section class="desc markdown">
+      <p>A generic mixin that requires GenericClass as a superclass.</p>
+    </section>
+    
+    <section>
+      <dl class="dl-horizontal">
+        <dt>Superclass Constraints</dt>
+        <dd><ul class="comma-separated dark mixin-relationships">
+          <li><a href="fake/GenericClass-class.html">GenericClass</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></li>
+        </ul></dd>
+
+
+
+
+        <dt>Implemented by</dt>
+        <dd><ul class="comma-separated mixin-relationships">
+          <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
+        </ul></dd>
+
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor" id="constructors">
+      <h2>Constructors</h2>
+
+      <dl class="constructor-summary-list">
+        <dt id="GenericMixin" class="callable">
+          <span class="name"><a href="fake/GenericMixin/GenericMixin.html">GenericMixin</a></span><span class="signature">()</span>
+        </dt>
+        <dd>
+          
+        </dd>
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor" id="instance-properties">
+      <h2>Properties</h2>
+
+      <dl class="properties">
+        <dt id="mixinMember" class="property">
+          <span class="name"><a href="fake/GenericMixin/mixinMember.html">mixinMember</a></span>
+          <span class="signature">&#8596; T</span> 
+        </dt>
+        <dd>
+          
+          <div class="features">read / write</div>
+</dd>
+        <dt id="overrideByBoth" class="property">
+          <span class="name"><a href="fake/GenericMixin/overrideByBoth.html">overrideByBoth</a></span>
+          <span class="signature">&#8596; T</span> 
+        </dt>
+        <dd>
+          Destined to be overridden by <a href="fake/ModifierClass-class.html">ModifierClass</a> and <a href="fake/GenericMixin-mixin.html">GenericMixin</a>, both.
+          <div class="features">read / write</div>
+</dd>
+        <dt id="overrideByEverything" class="property">
+          <span class="name"><a href="fake/GenericMixin/overrideByEverything.html">overrideByEverything</a></span>
+          <span class="signature">&#8596; T</span> 
+        </dt>
+        <dd>
+          Destined to be overridden by everything.
+          <div class="features">read / write</div>
+</dd>
+        <dt id="overrideByGenericMixin" class="property">
+          <span class="name"><a href="fake/GenericMixin/overrideByGenericMixin.html">overrideByGenericMixin</a></span>
+          <span class="signature">&#8596; T</span> 
+        </dt>
+        <dd>
+          Destined to be overridden by <a href="fake/GenericMixin-mixin.html">GenericMixin</a>.
+          <div class="features">read / write</div>
+</dd>
+        <dt id="hashCode" class="property inherited">
+          <span class="name"><a href="fake/GenericClass/hashCode.html">hashCode</a></span>
+          <span class="signature">&#8594; int</span> 
+        </dt>
+        <dd class="inherited">
+          
+          <div class="features">read-only, inherited</div>
+</dd>
+        <dt id="member" class="property inherited">
+          <span class="name"><a href="fake/GenericClass/member.html">member</a></span>
+          <span class="signature">&#8596; T</span> 
+        </dt>
+        <dd class="inherited">
+          
+          <div class="features">read / write, inherited</div>
+</dd>
+        <dt id="overrideByModifierClass" class="property inherited">
+          <span class="name"><a href="fake/GenericClass/overrideByModifierClass.html">overrideByModifierClass</a></span>
+          <span class="signature">&#8596; T</span> 
+        </dt>
+        <dd class="inherited">
+          Destined to be overridden by <a href="fake/ModifierClass-class.html">ModifierClass</a>.
+          <div class="features">read / write, inherited</div>
+</dd>
+        <dt id="runtimeType" class="property inherited">
+          <span class="name"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></span>
+          <span class="signature">&#8594; Type</span> 
+        </dt>
+        <dd class="inherited">
+          
+          <div class="features">read-only, inherited</div>
+</dd>
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor inherited" id="instance-methods">
+      <h2>Methods</h2>
+      <dl class="callables">
+        <dt id="noSuchMethod" class="callable inherited">
+          <span class="name"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
+            <span class="returntype parameter">&#8594; dynamic</span>
+          </span>
+          </dt>
+        <dd class="inherited">
+          
+          <div class="features">inherited</div>
+</dd>
+        <dt id="toString" class="callable inherited">
+          <span class="name"><a href="fake/GenericClass/toString.html">toString</a></span><span class="signature">(<wbr>)
+            <span class="returntype parameter">&#8594; String</span>
+          </span>
+          </dt>
+        <dd class="inherited">
+          
+          <div class="features">inherited</div>
+</dd>
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor inherited" id="operators">
+      <h2>Operators</h2>
+      <dl class="callables">
+        <dt id="operator ==" class="callable inherited">
+          <span class="name"><a href="fake/GenericClass/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
+            <span class="returntype parameter">&#8594; bool</span>
+          </span>
+          </dt>
+        <dd class="inherited">
+          
+          <div class="features">inherited</div>
+</dd>
+      </dl>
+    </section>
+
+
+
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+    <ol>
+      <li class="section-title"><a href="fake/GenericMixin-mixin.html#constructors">Constructors</a></li>
+      <li><a href="fake/GenericMixin/GenericMixin.html">GenericMixin</a></li>
+    
+      <li class="section-title">
+        <a href="fake/GenericMixin-mixin.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/GenericMixin/mixinMember.html">mixinMember</a></li>
+      <li><a href="fake/GenericMixin/overrideByBoth.html">overrideByBoth</a></li>
+      <li><a href="fake/GenericMixin/overrideByEverything.html">overrideByEverything</a></li>
+      <li><a href="fake/GenericMixin/overrideByGenericMixin.html">overrideByGenericMixin</a></li>
+      <li class="inherited"><a href="fake/GenericClass/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/GenericClass/member.html">member</a></li>
+      <li class="inherited"><a href="fake/GenericClass/overrideByModifierClass.html">overrideByModifierClass</a></li>
+      <li class="inherited"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericMixin-mixin.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/GenericClass/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericMixin-mixin.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/GenericClass/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs/fake/GenericMixin/GenericMixin.html b/testing/test_package_docs/fake/GenericMixin/GenericMixin.html
new file mode 100644
index 0000000000..eb946127f2
--- /dev/null
+++ b/testing/test_package_docs/fake/GenericMixin/GenericMixin.html
@@ -0,0 +1,103 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the GenericMixin constructor from the Mixin GenericMixin class from the fake library, for the Dart programming language.">
+  <title>GenericMixin constructor - GenericMixin class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/GenericMixin-mixin.html">GenericMixin<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
+    <li class="self-crumb">GenericMixin constructor</li>
+  </ol>
+  <div class="self-name">GenericMixin</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>GenericMixin mixin</h5>
+    <ol>
+      <li class="section-title"><a href="fake/GenericMixin-mixin.html#constructors">Constructors</a></li>
+      <li><a href="fake/GenericMixin/GenericMixin.html">GenericMixin</a></li>
+    
+      <li class="section-title">
+        <a href="fake/GenericMixin-mixin.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/GenericMixin/mixinMember.html">mixinMember</a></li>
+      <li><a href="fake/GenericMixin/overrideByBoth.html">overrideByBoth</a></li>
+      <li><a href="fake/GenericMixin/overrideByEverything.html">overrideByEverything</a></li>
+      <li><a href="fake/GenericMixin/overrideByGenericMixin.html">overrideByGenericMixin</a></li>
+      <li class="inherited"><a href="fake/GenericClass/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/GenericClass/member.html">member</a></li>
+      <li class="inherited"><a href="fake/GenericClass/overrideByModifierClass.html">overrideByModifierClass</a></li>
+      <li class="inherited"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericMixin-mixin.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/GenericClass/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericMixin-mixin.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/GenericClass/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-left-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>GenericMixin&lt;<wbr><span class="type-parameter">T</span>&gt; constructor</h1>
+
+    <section class="multi-line-signature">
+      
+      <span class="name ">GenericMixin&lt;<wbr><span class="type-parameter">T</span>&gt;</span>(<wbr>)
+    </section>
+
+    
+    
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs/fake/GenericMixin/mixinMember.html b/testing/test_package_docs/fake/GenericMixin/mixinMember.html
new file mode 100644
index 0000000000..fdbcb5a786
--- /dev/null
+++ b/testing/test_package_docs/fake/GenericMixin/mixinMember.html
@@ -0,0 +1,102 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the mixinMember property from the GenericMixin class, for the Dart programming language.">
+  <title>mixinMember property - GenericMixin class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/GenericMixin-mixin.html">GenericMixin<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
+    <li class="self-crumb">mixinMember property</li>
+  </ol>
+  <div class="self-name">mixinMember</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>GenericMixin mixin</h5>
+    <ol>
+      <li class="section-title"><a href="fake/GenericMixin-mixin.html#constructors">Constructors</a></li>
+      <li><a href="fake/GenericMixin/GenericMixin.html">GenericMixin</a></li>
+    
+      <li class="section-title">
+        <a href="fake/GenericMixin-mixin.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/GenericMixin/mixinMember.html">mixinMember</a></li>
+      <li><a href="fake/GenericMixin/overrideByBoth.html">overrideByBoth</a></li>
+      <li><a href="fake/GenericMixin/overrideByEverything.html">overrideByEverything</a></li>
+      <li><a href="fake/GenericMixin/overrideByGenericMixin.html">overrideByGenericMixin</a></li>
+      <li class="inherited"><a href="fake/GenericClass/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/GenericClass/member.html">member</a></li>
+      <li class="inherited"><a href="fake/GenericClass/overrideByModifierClass.html">overrideByModifierClass</a></li>
+      <li class="inherited"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericMixin-mixin.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/GenericClass/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericMixin-mixin.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/GenericClass/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>mixinMember property</h1>
+
+        <section class="multi-line-signature">
+          <span class="returntype">T</span>
+          <span class="name ">mixinMember</span>
+          <div class="features">read / write</div>
+        </section>
+                
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs/fake/GenericMixin/overrideByBoth.html b/testing/test_package_docs/fake/GenericMixin/overrideByBoth.html
new file mode 100644
index 0000000000..5560705dd7
--- /dev/null
+++ b/testing/test_package_docs/fake/GenericMixin/overrideByBoth.html
@@ -0,0 +1,105 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the overrideByBoth property from the GenericMixin class, for the Dart programming language.">
+  <title>overrideByBoth property - GenericMixin class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/GenericMixin-mixin.html">GenericMixin<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
+    <li class="self-crumb">overrideByBoth property</li>
+  </ol>
+  <div class="self-name">overrideByBoth</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>GenericMixin mixin</h5>
+    <ol>
+      <li class="section-title"><a href="fake/GenericMixin-mixin.html#constructors">Constructors</a></li>
+      <li><a href="fake/GenericMixin/GenericMixin.html">GenericMixin</a></li>
+    
+      <li class="section-title">
+        <a href="fake/GenericMixin-mixin.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/GenericMixin/mixinMember.html">mixinMember</a></li>
+      <li><a href="fake/GenericMixin/overrideByBoth.html">overrideByBoth</a></li>
+      <li><a href="fake/GenericMixin/overrideByEverything.html">overrideByEverything</a></li>
+      <li><a href="fake/GenericMixin/overrideByGenericMixin.html">overrideByGenericMixin</a></li>
+      <li class="inherited"><a href="fake/GenericClass/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/GenericClass/member.html">member</a></li>
+      <li class="inherited"><a href="fake/GenericClass/overrideByModifierClass.html">overrideByModifierClass</a></li>
+      <li class="inherited"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericMixin-mixin.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/GenericClass/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericMixin-mixin.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/GenericClass/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>overrideByBoth property</h1>
+
+        <section class="multi-line-signature">
+          <span class="returntype">T</span>
+          <span class="name ">overrideByBoth</span>
+          <div class="features">read / write</div>
+        </section>
+        <section class="desc markdown">
+          <p>Destined to be overridden by <a href="fake/ModifierClass-class.html">ModifierClass</a> and <a href="fake/GenericMixin-mixin.html">GenericMixin</a>, both.</p>
+        </section>
+                
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs/fake/GenericMixin/overrideByEverything.html b/testing/test_package_docs/fake/GenericMixin/overrideByEverything.html
new file mode 100644
index 0000000000..78caaecef1
--- /dev/null
+++ b/testing/test_package_docs/fake/GenericMixin/overrideByEverything.html
@@ -0,0 +1,105 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the overrideByEverything property from the GenericMixin class, for the Dart programming language.">
+  <title>overrideByEverything property - GenericMixin class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/GenericMixin-mixin.html">GenericMixin<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
+    <li class="self-crumb">overrideByEverything property</li>
+  </ol>
+  <div class="self-name">overrideByEverything</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>GenericMixin mixin</h5>
+    <ol>
+      <li class="section-title"><a href="fake/GenericMixin-mixin.html#constructors">Constructors</a></li>
+      <li><a href="fake/GenericMixin/GenericMixin.html">GenericMixin</a></li>
+    
+      <li class="section-title">
+        <a href="fake/GenericMixin-mixin.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/GenericMixin/mixinMember.html">mixinMember</a></li>
+      <li><a href="fake/GenericMixin/overrideByBoth.html">overrideByBoth</a></li>
+      <li><a href="fake/GenericMixin/overrideByEverything.html">overrideByEverything</a></li>
+      <li><a href="fake/GenericMixin/overrideByGenericMixin.html">overrideByGenericMixin</a></li>
+      <li class="inherited"><a href="fake/GenericClass/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/GenericClass/member.html">member</a></li>
+      <li class="inherited"><a href="fake/GenericClass/overrideByModifierClass.html">overrideByModifierClass</a></li>
+      <li class="inherited"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericMixin-mixin.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/GenericClass/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericMixin-mixin.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/GenericClass/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>overrideByEverything property</h1>
+
+        <section class="multi-line-signature">
+          <span class="returntype">T</span>
+          <span class="name ">overrideByEverything</span>
+          <div class="features">read / write</div>
+        </section>
+        <section class="desc markdown">
+          <p>Destined to be overridden by everything.</p>
+        </section>
+                
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs/fake/GenericMixin/overrideByGenericMixin.html b/testing/test_package_docs/fake/GenericMixin/overrideByGenericMixin.html
new file mode 100644
index 0000000000..b3edae35f6
--- /dev/null
+++ b/testing/test_package_docs/fake/GenericMixin/overrideByGenericMixin.html
@@ -0,0 +1,105 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the overrideByGenericMixin property from the GenericMixin class, for the Dart programming language.">
+  <title>overrideByGenericMixin property - GenericMixin class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/GenericMixin-mixin.html">GenericMixin<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
+    <li class="self-crumb">overrideByGenericMixin property</li>
+  </ol>
+  <div class="self-name">overrideByGenericMixin</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>GenericMixin mixin</h5>
+    <ol>
+      <li class="section-title"><a href="fake/GenericMixin-mixin.html#constructors">Constructors</a></li>
+      <li><a href="fake/GenericMixin/GenericMixin.html">GenericMixin</a></li>
+    
+      <li class="section-title">
+        <a href="fake/GenericMixin-mixin.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/GenericMixin/mixinMember.html">mixinMember</a></li>
+      <li><a href="fake/GenericMixin/overrideByBoth.html">overrideByBoth</a></li>
+      <li><a href="fake/GenericMixin/overrideByEverything.html">overrideByEverything</a></li>
+      <li><a href="fake/GenericMixin/overrideByGenericMixin.html">overrideByGenericMixin</a></li>
+      <li class="inherited"><a href="fake/GenericClass/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/GenericClass/member.html">member</a></li>
+      <li class="inherited"><a href="fake/GenericClass/overrideByModifierClass.html">overrideByModifierClass</a></li>
+      <li class="inherited"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericMixin-mixin.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/GenericClass/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericMixin-mixin.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/GenericClass/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>overrideByGenericMixin property</h1>
+
+        <section class="multi-line-signature">
+          <span class="returntype">T</span>
+          <span class="name ">overrideByGenericMixin</span>
+          <div class="features">read / write</div>
+        </section>
+        <section class="desc markdown">
+          <p>Destined to be overridden by <a href="fake/GenericMixin-mixin.html">GenericMixin</a>.</p>
+        </section>
+                
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs/fake/GenericTypedef.html b/testing/test_package_docs/fake/GenericTypedef.html
index 5b39c51ff3..a6e35b344c 100644
--- a/testing/test_package_docs/fake/GenericTypedef.html
+++ b/testing/test_package_docs/fake/GenericTypedef.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/HasGenericWithExtends-class.html b/testing/test_package_docs/fake/HasGenericWithExtends-class.html
index a79991cc6d..2557289446 100644
--- a/testing/test_package_docs/fake/HasGenericWithExtends-class.html
+++ b/testing/test_package_docs/fake/HasGenericWithExtends-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/HasGenerics-class.html b/testing/test_package_docs/fake/HasGenerics-class.html
index fe4ed37a75..a5140bc22b 100644
--- a/testing/test_package_docs/fake/HasGenerics-class.html
+++ b/testing/test_package_docs/fake/HasGenerics-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/HasPragma-class.html b/testing/test_package_docs/fake/HasPragma-class.html
index fcf7b10441..b4c50d46a4 100644
--- a/testing/test_package_docs/fake/HasPragma-class.html
+++ b/testing/test_package_docs/fake/HasPragma-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/ImplementingThingy-class.html b/testing/test_package_docs/fake/ImplementingThingy-class.html
index 98652ddab6..3dce7a95c2 100644
--- a/testing/test_package_docs/fake/ImplementingThingy-class.html
+++ b/testing/test_package_docs/fake/ImplementingThingy-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/ImplementingThingy2-class.html b/testing/test_package_docs/fake/ImplementingThingy2-class.html
index a75094a54e..3e6fbccec7 100644
--- a/testing/test_package_docs/fake/ImplementingThingy2-class.html
+++ b/testing/test_package_docs/fake/ImplementingThingy2-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/ImplementsFutureVoid-class.html b/testing/test_package_docs/fake/ImplementsFutureVoid-class.html
index 85acb3e573..5d9c8ad88a 100644
--- a/testing/test_package_docs/fake/ImplementsFutureVoid-class.html
+++ b/testing/test_package_docs/fake/ImplementsFutureVoid-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/ImplicitProperties-class.html b/testing/test_package_docs/fake/ImplicitProperties-class.html
index 806d2f60c8..a3ac385fdc 100644
--- a/testing/test_package_docs/fake/ImplicitProperties-class.html
+++ b/testing/test_package_docs/fake/ImplicitProperties-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/InheritingClassOne-class.html b/testing/test_package_docs/fake/InheritingClassOne-class.html
index 2583699db9..cf83e404e9 100644
--- a/testing/test_package_docs/fake/InheritingClassOne-class.html
+++ b/testing/test_package_docs/fake/InheritingClassOne-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/InheritingClassTwo-class.html b/testing/test_package_docs/fake/InheritingClassTwo-class.html
index 1fa0111ce7..ebc0c47ea4 100644
--- a/testing/test_package_docs/fake/InheritingClassTwo-class.html
+++ b/testing/test_package_docs/fake/InheritingClassTwo-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/Interface-class.html b/testing/test_package_docs/fake/Interface-class.html
index 7fcaa5304c..d11a4ff5f2 100644
--- a/testing/test_package_docs/fake/Interface-class.html
+++ b/testing/test_package_docs/fake/Interface-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/LongFirstLine-class.html b/testing/test_package_docs/fake/LongFirstLine-class.html
index 4de0826bcb..3e30eab3ce 100644
--- a/testing/test_package_docs/fake/LongFirstLine-class.html
+++ b/testing/test_package_docs/fake/LongFirstLine-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/LotsAndLotsOfParameters.html b/testing/test_package_docs/fake/LotsAndLotsOfParameters.html
index dddb5b0ce1..9445343a41 100644
--- a/testing/test_package_docs/fake/LotsAndLotsOfParameters.html
+++ b/testing/test_package_docs/fake/LotsAndLotsOfParameters.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/MIEEBase-class.html b/testing/test_package_docs/fake/MIEEBase-class.html
index 5fe558c375..9b52aeccbe 100644
--- a/testing/test_package_docs/fake/MIEEBase-class.html
+++ b/testing/test_package_docs/fake/MIEEBase-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/MIEEMixin-class.html b/testing/test_package_docs/fake/MIEEMixin-class.html
index eea2818754..af6d1b15e5 100644
--- a/testing/test_package_docs/fake/MIEEMixin-class.html
+++ b/testing/test_package_docs/fake/MIEEMixin-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/MIEEMixinWithOverride-class.html b/testing/test_package_docs/fake/MIEEMixinWithOverride-class.html
index 7362677556..0ec671a3f7 100644
--- a/testing/test_package_docs/fake/MIEEMixinWithOverride-class.html
+++ b/testing/test_package_docs/fake/MIEEMixinWithOverride-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/MIEEThing-class.html b/testing/test_package_docs/fake/MIEEThing-class.html
index 8c095c63ae..f7cdf0f9a2 100644
--- a/testing/test_package_docs/fake/MIEEThing-class.html
+++ b/testing/test_package_docs/fake/MIEEThing-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/MixMeIn-class.html b/testing/test_package_docs/fake/MixMeIn-class.html
index 1d32b31799..bbd79206f4 100644
--- a/testing/test_package_docs/fake/MixMeIn-class.html
+++ b/testing/test_package_docs/fake/MixMeIn-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/ModifierClass-class.html b/testing/test_package_docs/fake/ModifierClass-class.html
new file mode 100644
index 0000000000..acee2158db
--- /dev/null
+++ b/testing/test_package_docs/fake/ModifierClass-class.html
@@ -0,0 +1,371 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the ModifierClass class from the fake library, for the Dart programming language.">
+  <title>ModifierClass class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li class="self-crumb">ModifierClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span> class</li>
+  </ol>
+  <div class="self-name">ModifierClass</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>fake library</h5>
+    <ol>
+      <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
+      <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
+      <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
+      <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
+      <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
+      <li><a href="fake/Annotation-class.html">Annotation</a></li>
+      <li><a href="fake/AnotherInterface-class.html">AnotherInterface</a></li>
+      <li><a href="fake/ATypeTakingClass-class.html">ATypeTakingClass</a></li>
+      <li><a href="fake/ATypeTakingClassMixedIn-class.html">ATypeTakingClassMixedIn</a></li>
+      <li><a href="fake/BaseForDocComments-class.html">BaseForDocComments</a></li>
+      <li><a href="fake/BaseThingy-class.html">BaseThingy</a></li>
+      <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
+      <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
+      <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
+      <li><a href="fake/Cool-class.html">Cool</a></li>
+      <li><a href="fake/DocumentWithATable-class.html">DocumentWithATable</a></li>
+      <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
+      <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
+      <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
+      <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
+      <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
+      <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
+      <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
+      <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
+      <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
+      <li><a href="fake/ImplicitProperties-class.html">ImplicitProperties</a></li>
+      <li><a href="fake/InheritingClassOne-class.html">InheritingClassOne</a></li>
+      <li><a href="fake/InheritingClassTwo-class.html">InheritingClassTwo</a></li>
+      <li><a href="fake/Interface-class.html">Interface</a></li>
+      <li><a href="fake/LongFirstLine-class.html">LongFirstLine</a></li>
+      <li><a href="fake/MIEEBase-class.html">MIEEBase</a></li>
+      <li><a href="fake/MIEEMixin-class.html">MIEEMixin</a></li>
+      <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
+      <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
+      <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
+      <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
+      <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
+      <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
+      <li><a href="fake/ReferringClass-class.html">ReferringClass</a></li>
+      <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+      <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
+      <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
+      <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
+      <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
+      <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
+      <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
+      <li><a href="fake/CUSTOM_CLASS_PRIVATE-constant.html">CUSTOM_CLASS_PRIVATE</a></li>
+      <li><a class="deprecated" href="fake/DOWN-constant.html">DOWN</a></li>
+      <li><a href="fake/greatAnnotation-constant.html">greatAnnotation</a></li>
+      <li><a href="fake/greatestAnnotation-constant.html">greatestAnnotation</a></li>
+      <li><a href="fake/incorrectDocReference-constant.html">incorrectDocReference</a></li>
+      <li><a href="fake/myMap-constant.html">myMap</a></li>
+      <li><a href="fake/NAME_SINGLEUNDERSCORE-constant.html">NAME_SINGLEUNDERSCORE</a></li>
+      <li><a href="fake/NAME_WITH_TWO_UNDERSCORES-constant.html">NAME_WITH_TWO_UNDERSCORES</a></li>
+      <li><a href="fake/PI-constant.html">PI</a></li>
+      <li><a href="fake/required-constant.html">required</a></li>
+      <li><a href="fake/testingCodeSyntaxInOneLiners-constant.html">testingCodeSyntaxInOneLiners</a></li>
+      <li><a href="fake/UP-constant.html">UP</a></li>
+      <li><a href="fake/ZERO-constant.html">ZERO</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
+      <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
+      <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
+      <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
+      <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
+      <li><a href="fake/justGetter.html">justGetter</a></li>
+      <li><a href="fake/justSetter.html">justSetter</a></li>
+      <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
+      <li><a class="deprecated" href="fake/meaningOfLife.html">meaningOfLife</a></li>
+      <li><a href="fake/mustGetThis.html">mustGetThis</a></li>
+      <li><a href="fake/setAndGet.html">setAndGet</a></li>
+      <li><a href="fake/simpleProperty.html">simpleProperty</a></li>
+      <li><a href="fake/useSomethingInAnotherPackage.html">useSomethingInAnotherPackage</a></li>
+      <li><a href="fake/useSomethingInTheSdk.html">useSomethingInTheSdk</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#functions">Functions</a></li>
+      <li><a href="fake/addCallback.html">addCallback</a></li>
+      <li><a href="fake/addCallback2.html">addCallback2</a></li>
+      <li><a href="fake/aVoidParameter.html">aVoidParameter</a></li>
+      <li><a href="fake/functionWithFunctionParameters.html">functionWithFunctionParameters</a></li>
+      <li><a href="fake/myGenericFunction.html">myGenericFunction</a></li>
+      <li><a href="fake/onlyPositionalWithNoDefaultNoType.html">onlyPositionalWithNoDefaultNoType</a></li>
+      <li><a href="fake/paintImage1.html">paintImage1</a></li>
+      <li><a href="fake/paintImage2.html">paintImage2</a></li>
+      <li><a href="fake/paramFromAnotherLib.html">paramFromAnotherLib</a></li>
+      <li><a href="fake/paramOfFutureOrNull.html">paramOfFutureOrNull</a></li>
+      <li><a href="fake/returningFutureVoid.html">returningFutureVoid</a></li>
+      <li><a href="fake/short.html">short</a></li>
+      <li><a href="fake/soIntense.html">soIntense</a></li>
+      <li><a href="fake/thisIsAlsoAsync.html">thisIsAlsoAsync</a></li>
+      <li><a href="fake/thisIsAsync.html">thisIsAsync</a></li>
+      <li><a href="fake/thisIsFutureOr.html">thisIsFutureOr</a></li>
+      <li><a href="fake/thisIsFutureOrNull.html">thisIsFutureOrNull</a></li>
+      <li><a href="fake/thisIsFutureOrT.html">thisIsFutureOrT</a></li>
+      <li><a class="deprecated" href="fake/topLevelFunction.html">topLevelFunction</a></li>
+      <li><a href="fake/typeParamOfFutureOr.html">typeParamOfFutureOr</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#enums">Enums</a></li>
+      <li><a href="fake/Color-class.html">Color</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#typedefs">Typedefs</a></li>
+      <li><a href="fake/Callback2.html">Callback2</a></li>
+      <li><a class="deprecated" href="fake/FakeProcesses.html">FakeProcesses</a></li>
+      <li><a href="fake/GenericTypedef.html">GenericTypedef</a></li>
+      <li><a href="fake/LotsAndLotsOfParameters.html">LotsAndLotsOfParameters</a></li>
+      <li><a href="fake/myCoolTypedef.html">myCoolTypedef</a></li>
+      <li><a href="fake/NewGenericTypedef.html">NewGenericTypedef</a></li>
+      <li><a href="fake/VoidCallback.html">VoidCallback</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#exceptions">Exceptions</a></li>
+      <li><a class="deprecated" href="fake/Doh-class.html">Doh</a></li>
+      <li><a href="fake/Oops-class.html">Oops</a></li>
+    </ol>
+  </div>
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+      <h1>ModifierClass&lt;<wbr><span class="type-parameter">T</span>&gt; class </h1>
+
+    <section class="desc markdown">
+      <p>A class extending a generic class.</p>
+    </section>
+    
+    <section>
+      <dl class="dl-horizontal">
+        <dt>Inheritance</dt>
+        <dd><ul class="gt-separated dark clazz-relationships">
+          <li>Object</li>
+          <li><a href="fake/GenericClass-class.html">GenericClass</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></li>
+          <li>ModifierClass</li>
+        </ul></dd>
+
+
+
+        <dt>Implementers</dt>
+        <dd><ul class="comma-separated clazz-relationships">
+          <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
+        </ul></dd>
+
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor" id="constructors">
+      <h2>Constructors</h2>
+
+      <dl class="constructor-summary-list">
+        <dt id="ModifierClass" class="callable">
+          <span class="name"><a href="fake/ModifierClass/ModifierClass.html">ModifierClass</a></span><span class="signature">()</span>
+        </dt>
+        <dd>
+          
+        </dd>
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor" id="instance-properties">
+      <h2>Properties</h2>
+
+      <dl class="properties">
+        <dt id="modifierMember" class="property">
+          <span class="name"><a href="fake/ModifierClass/modifierMember.html">modifierMember</a></span>
+          <span class="signature">&#8596; T</span> 
+        </dt>
+        <dd>
+          
+          <div class="features">read / write</div>
+</dd>
+        <dt id="overrideByBoth" class="property">
+          <span class="name"><a href="fake/ModifierClass/overrideByBoth.html">overrideByBoth</a></span>
+          <span class="signature">&#8596; T</span> 
+        </dt>
+        <dd>
+          Destined to be overridden by <a href="fake/ModifierClass-class.html">ModifierClass</a> and <a href="fake/GenericMixin-mixin.html">GenericMixin</a>, both.
+          <div class="features">read / write</div>
+</dd>
+        <dt id="overrideByEverything" class="property">
+          <span class="name"><a href="fake/ModifierClass/overrideByEverything.html">overrideByEverything</a></span>
+          <span class="signature">&#8596; T</span> 
+        </dt>
+        <dd>
+          Destined to be overridden by everything.
+          <div class="features">read / write</div>
+</dd>
+        <dt id="overrideByModifierClass" class="property">
+          <span class="name"><a href="fake/ModifierClass/overrideByModifierClass.html">overrideByModifierClass</a></span>
+          <span class="signature">&#8596; T</span> 
+        </dt>
+        <dd>
+          Destined to be overridden by <a href="fake/ModifierClass-class.html">ModifierClass</a>.
+          <div class="features">read / write</div>
+</dd>
+        <dt id="hashCode" class="property inherited">
+          <span class="name"><a href="fake/GenericClass/hashCode.html">hashCode</a></span>
+          <span class="signature">&#8594; int</span> 
+        </dt>
+        <dd class="inherited">
+          
+          <div class="features">read-only, inherited</div>
+</dd>
+        <dt id="member" class="property inherited">
+          <span class="name"><a href="fake/GenericClass/member.html">member</a></span>
+          <span class="signature">&#8596; T</span> 
+        </dt>
+        <dd class="inherited">
+          
+          <div class="features">read / write, inherited</div>
+</dd>
+        <dt id="overrideByGenericMixin" class="property inherited">
+          <span class="name"><a href="fake/GenericClass/overrideByGenericMixin.html">overrideByGenericMixin</a></span>
+          <span class="signature">&#8596; T</span> 
+        </dt>
+        <dd class="inherited">
+          Destined to be overridden by <a href="fake/GenericMixin-mixin.html">GenericMixin</a>.
+          <div class="features">read / write, inherited</div>
+</dd>
+        <dt id="runtimeType" class="property inherited">
+          <span class="name"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></span>
+          <span class="signature">&#8594; Type</span> 
+        </dt>
+        <dd class="inherited">
+          
+          <div class="features">read-only, inherited</div>
+</dd>
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor inherited" id="instance-methods">
+      <h2>Methods</h2>
+      <dl class="callables">
+        <dt id="noSuchMethod" class="callable inherited">
+          <span class="name"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
+            <span class="returntype parameter">&#8594; dynamic</span>
+          </span>
+          </dt>
+        <dd class="inherited">
+          
+          <div class="features">inherited</div>
+</dd>
+        <dt id="toString" class="callable inherited">
+          <span class="name"><a href="fake/GenericClass/toString.html">toString</a></span><span class="signature">(<wbr>)
+            <span class="returntype parameter">&#8594; String</span>
+          </span>
+          </dt>
+        <dd class="inherited">
+          
+          <div class="features">inherited</div>
+</dd>
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor inherited" id="operators">
+      <h2>Operators</h2>
+      <dl class="callables">
+        <dt id="operator ==" class="callable inherited">
+          <span class="name"><a href="fake/GenericClass/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
+            <span class="returntype parameter">&#8594; bool</span>
+          </span>
+          </dt>
+        <dd class="inherited">
+          
+          <div class="features">inherited</div>
+</dd>
+      </dl>
+    </section>
+
+
+
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+    <ol>
+      <li class="section-title"><a href="fake/ModifierClass-class.html#constructors">Constructors</a></li>
+      <li><a href="fake/ModifierClass/ModifierClass.html">ModifierClass</a></li>
+    
+      <li class="section-title">
+        <a href="fake/ModifierClass-class.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/ModifierClass/modifierMember.html">modifierMember</a></li>
+      <li><a href="fake/ModifierClass/overrideByBoth.html">overrideByBoth</a></li>
+      <li><a href="fake/ModifierClass/overrideByEverything.html">overrideByEverything</a></li>
+      <li><a href="fake/ModifierClass/overrideByModifierClass.html">overrideByModifierClass</a></li>
+      <li class="inherited"><a href="fake/GenericClass/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/GenericClass/member.html">member</a></li>
+      <li class="inherited"><a href="fake/GenericClass/overrideByGenericMixin.html">overrideByGenericMixin</a></li>
+      <li class="inherited"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/ModifierClass-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/GenericClass/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/ModifierClass-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/GenericClass/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs/fake/ModifierClass/ModifierClass.html b/testing/test_package_docs/fake/ModifierClass/ModifierClass.html
new file mode 100644
index 0000000000..1c4853f334
--- /dev/null
+++ b/testing/test_package_docs/fake/ModifierClass/ModifierClass.html
@@ -0,0 +1,103 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the ModifierClass constructor from the Class ModifierClass class from the fake library, for the Dart programming language.">
+  <title>ModifierClass constructor - ModifierClass class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/ModifierClass-class.html">ModifierClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
+    <li class="self-crumb">ModifierClass constructor</li>
+  </ol>
+  <div class="self-name">ModifierClass</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>ModifierClass class</h5>
+    <ol>
+      <li class="section-title"><a href="fake/ModifierClass-class.html#constructors">Constructors</a></li>
+      <li><a href="fake/ModifierClass/ModifierClass.html">ModifierClass</a></li>
+    
+      <li class="section-title">
+        <a href="fake/ModifierClass-class.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/ModifierClass/modifierMember.html">modifierMember</a></li>
+      <li><a href="fake/ModifierClass/overrideByBoth.html">overrideByBoth</a></li>
+      <li><a href="fake/ModifierClass/overrideByEverything.html">overrideByEverything</a></li>
+      <li><a href="fake/ModifierClass/overrideByModifierClass.html">overrideByModifierClass</a></li>
+      <li class="inherited"><a href="fake/GenericClass/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/GenericClass/member.html">member</a></li>
+      <li class="inherited"><a href="fake/GenericClass/overrideByGenericMixin.html">overrideByGenericMixin</a></li>
+      <li class="inherited"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/ModifierClass-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/GenericClass/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/ModifierClass-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/GenericClass/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-left-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>ModifierClass&lt;<wbr><span class="type-parameter">T</span>&gt; constructor</h1>
+
+    <section class="multi-line-signature">
+      
+      <span class="name ">ModifierClass&lt;<wbr><span class="type-parameter">T</span>&gt;</span>(<wbr>)
+    </section>
+
+    
+    
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs/fake/ModifierClass/modifierMember.html b/testing/test_package_docs/fake/ModifierClass/modifierMember.html
new file mode 100644
index 0000000000..d66b050652
--- /dev/null
+++ b/testing/test_package_docs/fake/ModifierClass/modifierMember.html
@@ -0,0 +1,102 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the modifierMember property from the ModifierClass class, for the Dart programming language.">
+  <title>modifierMember property - ModifierClass class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/ModifierClass-class.html">ModifierClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
+    <li class="self-crumb">modifierMember property</li>
+  </ol>
+  <div class="self-name">modifierMember</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>ModifierClass class</h5>
+    <ol>
+      <li class="section-title"><a href="fake/ModifierClass-class.html#constructors">Constructors</a></li>
+      <li><a href="fake/ModifierClass/ModifierClass.html">ModifierClass</a></li>
+    
+      <li class="section-title">
+        <a href="fake/ModifierClass-class.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/ModifierClass/modifierMember.html">modifierMember</a></li>
+      <li><a href="fake/ModifierClass/overrideByBoth.html">overrideByBoth</a></li>
+      <li><a href="fake/ModifierClass/overrideByEverything.html">overrideByEverything</a></li>
+      <li><a href="fake/ModifierClass/overrideByModifierClass.html">overrideByModifierClass</a></li>
+      <li class="inherited"><a href="fake/GenericClass/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/GenericClass/member.html">member</a></li>
+      <li class="inherited"><a href="fake/GenericClass/overrideByGenericMixin.html">overrideByGenericMixin</a></li>
+      <li class="inherited"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/ModifierClass-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/GenericClass/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/ModifierClass-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/GenericClass/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>modifierMember property</h1>
+
+        <section class="multi-line-signature">
+          <span class="returntype">T</span>
+          <span class="name ">modifierMember</span>
+          <div class="features">read / write</div>
+        </section>
+                
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs/fake/ModifierClass/overrideByBoth.html b/testing/test_package_docs/fake/ModifierClass/overrideByBoth.html
new file mode 100644
index 0000000000..84fdf6961e
--- /dev/null
+++ b/testing/test_package_docs/fake/ModifierClass/overrideByBoth.html
@@ -0,0 +1,105 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the overrideByBoth property from the ModifierClass class, for the Dart programming language.">
+  <title>overrideByBoth property - ModifierClass class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/ModifierClass-class.html">ModifierClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
+    <li class="self-crumb">overrideByBoth property</li>
+  </ol>
+  <div class="self-name">overrideByBoth</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>ModifierClass class</h5>
+    <ol>
+      <li class="section-title"><a href="fake/ModifierClass-class.html#constructors">Constructors</a></li>
+      <li><a href="fake/ModifierClass/ModifierClass.html">ModifierClass</a></li>
+    
+      <li class="section-title">
+        <a href="fake/ModifierClass-class.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/ModifierClass/modifierMember.html">modifierMember</a></li>
+      <li><a href="fake/ModifierClass/overrideByBoth.html">overrideByBoth</a></li>
+      <li><a href="fake/ModifierClass/overrideByEverything.html">overrideByEverything</a></li>
+      <li><a href="fake/ModifierClass/overrideByModifierClass.html">overrideByModifierClass</a></li>
+      <li class="inherited"><a href="fake/GenericClass/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/GenericClass/member.html">member</a></li>
+      <li class="inherited"><a href="fake/GenericClass/overrideByGenericMixin.html">overrideByGenericMixin</a></li>
+      <li class="inherited"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/ModifierClass-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/GenericClass/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/ModifierClass-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/GenericClass/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>overrideByBoth property</h1>
+
+        <section class="multi-line-signature">
+          <span class="returntype">T</span>
+          <span class="name ">overrideByBoth</span>
+          <div class="features">read / write</div>
+        </section>
+        <section class="desc markdown">
+          <p>Destined to be overridden by <a href="fake/ModifierClass-class.html">ModifierClass</a> and <a href="fake/GenericMixin-mixin.html">GenericMixin</a>, both.</p>
+        </section>
+                
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs/fake/ModifierClass/overrideByEverything.html b/testing/test_package_docs/fake/ModifierClass/overrideByEverything.html
new file mode 100644
index 0000000000..6746496c49
--- /dev/null
+++ b/testing/test_package_docs/fake/ModifierClass/overrideByEverything.html
@@ -0,0 +1,105 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the overrideByEverything property from the ModifierClass class, for the Dart programming language.">
+  <title>overrideByEverything property - ModifierClass class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/ModifierClass-class.html">ModifierClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
+    <li class="self-crumb">overrideByEverything property</li>
+  </ol>
+  <div class="self-name">overrideByEverything</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>ModifierClass class</h5>
+    <ol>
+      <li class="section-title"><a href="fake/ModifierClass-class.html#constructors">Constructors</a></li>
+      <li><a href="fake/ModifierClass/ModifierClass.html">ModifierClass</a></li>
+    
+      <li class="section-title">
+        <a href="fake/ModifierClass-class.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/ModifierClass/modifierMember.html">modifierMember</a></li>
+      <li><a href="fake/ModifierClass/overrideByBoth.html">overrideByBoth</a></li>
+      <li><a href="fake/ModifierClass/overrideByEverything.html">overrideByEverything</a></li>
+      <li><a href="fake/ModifierClass/overrideByModifierClass.html">overrideByModifierClass</a></li>
+      <li class="inherited"><a href="fake/GenericClass/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/GenericClass/member.html">member</a></li>
+      <li class="inherited"><a href="fake/GenericClass/overrideByGenericMixin.html">overrideByGenericMixin</a></li>
+      <li class="inherited"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/ModifierClass-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/GenericClass/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/ModifierClass-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/GenericClass/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>overrideByEverything property</h1>
+
+        <section class="multi-line-signature">
+          <span class="returntype">T</span>
+          <span class="name ">overrideByEverything</span>
+          <div class="features">read / write</div>
+        </section>
+        <section class="desc markdown">
+          <p>Destined to be overridden by everything.</p>
+        </section>
+                
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs/fake/ModifierClass/overrideByModifierClass.html b/testing/test_package_docs/fake/ModifierClass/overrideByModifierClass.html
new file mode 100644
index 0000000000..2d01cea479
--- /dev/null
+++ b/testing/test_package_docs/fake/ModifierClass/overrideByModifierClass.html
@@ -0,0 +1,105 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the overrideByModifierClass property from the ModifierClass class, for the Dart programming language.">
+  <title>overrideByModifierClass property - ModifierClass class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/ModifierClass-class.html">ModifierClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
+    <li class="self-crumb">overrideByModifierClass property</li>
+  </ol>
+  <div class="self-name">overrideByModifierClass</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>ModifierClass class</h5>
+    <ol>
+      <li class="section-title"><a href="fake/ModifierClass-class.html#constructors">Constructors</a></li>
+      <li><a href="fake/ModifierClass/ModifierClass.html">ModifierClass</a></li>
+    
+      <li class="section-title">
+        <a href="fake/ModifierClass-class.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/ModifierClass/modifierMember.html">modifierMember</a></li>
+      <li><a href="fake/ModifierClass/overrideByBoth.html">overrideByBoth</a></li>
+      <li><a href="fake/ModifierClass/overrideByEverything.html">overrideByEverything</a></li>
+      <li><a href="fake/ModifierClass/overrideByModifierClass.html">overrideByModifierClass</a></li>
+      <li class="inherited"><a href="fake/GenericClass/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/GenericClass/member.html">member</a></li>
+      <li class="inherited"><a href="fake/GenericClass/overrideByGenericMixin.html">overrideByGenericMixin</a></li>
+      <li class="inherited"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/ModifierClass-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/GenericClass/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/ModifierClass-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/GenericClass/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>overrideByModifierClass property</h1>
+
+        <section class="multi-line-signature">
+          <span class="returntype">T</span>
+          <span class="name ">overrideByModifierClass</span>
+          <div class="features">read / write</div>
+        </section>
+        <section class="desc markdown">
+          <p>Destined to be overridden by <a href="fake/ModifierClass-class.html">ModifierClass</a>.</p>
+        </section>
+                
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs/fake/NAME_SINGLEUNDERSCORE-constant.html b/testing/test_package_docs/fake/NAME_SINGLEUNDERSCORE-constant.html
index 32d6460408..696662d762 100644
--- a/testing/test_package_docs/fake/NAME_SINGLEUNDERSCORE-constant.html
+++ b/testing/test_package_docs/fake/NAME_SINGLEUNDERSCORE-constant.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/NAME_WITH_TWO_UNDERSCORES-constant.html b/testing/test_package_docs/fake/NAME_WITH_TWO_UNDERSCORES-constant.html
index 4bdb4136fd..2a81d2d5bf 100644
--- a/testing/test_package_docs/fake/NAME_WITH_TWO_UNDERSCORES-constant.html
+++ b/testing/test_package_docs/fake/NAME_WITH_TWO_UNDERSCORES-constant.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/NewGenericTypedef.html b/testing/test_package_docs/fake/NewGenericTypedef.html
index 9d6a219514..f7802c1204 100644
--- a/testing/test_package_docs/fake/NewGenericTypedef.html
+++ b/testing/test_package_docs/fake/NewGenericTypedef.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/NewStyleMixinCallingSuper-mixin.html b/testing/test_package_docs/fake/NewStyleMixinCallingSuper-mixin.html
new file mode 100644
index 0000000000..81bbaae916
--- /dev/null
+++ b/testing/test_package_docs/fake/NewStyleMixinCallingSuper-mixin.html
@@ -0,0 +1,326 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the NewStyleMixinCallingSuper mixin from the fake library, for the Dart programming language.">
+  <title>NewStyleMixinCallingSuper mixin - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li class="self-crumb">NewStyleMixinCallingSuper mixin</li>
+  </ol>
+  <div class="self-name">NewStyleMixinCallingSuper</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>fake library</h5>
+    <ol>
+      <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
+      <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
+      <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
+      <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
+      <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
+      <li><a href="fake/Annotation-class.html">Annotation</a></li>
+      <li><a href="fake/AnotherInterface-class.html">AnotherInterface</a></li>
+      <li><a href="fake/ATypeTakingClass-class.html">ATypeTakingClass</a></li>
+      <li><a href="fake/ATypeTakingClassMixedIn-class.html">ATypeTakingClassMixedIn</a></li>
+      <li><a href="fake/BaseForDocComments-class.html">BaseForDocComments</a></li>
+      <li><a href="fake/BaseThingy-class.html">BaseThingy</a></li>
+      <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
+      <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
+      <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
+      <li><a href="fake/Cool-class.html">Cool</a></li>
+      <li><a href="fake/DocumentWithATable-class.html">DocumentWithATable</a></li>
+      <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
+      <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
+      <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
+      <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
+      <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
+      <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
+      <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
+      <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
+      <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
+      <li><a href="fake/ImplicitProperties-class.html">ImplicitProperties</a></li>
+      <li><a href="fake/InheritingClassOne-class.html">InheritingClassOne</a></li>
+      <li><a href="fake/InheritingClassTwo-class.html">InheritingClassTwo</a></li>
+      <li><a href="fake/Interface-class.html">Interface</a></li>
+      <li><a href="fake/LongFirstLine-class.html">LongFirstLine</a></li>
+      <li><a href="fake/MIEEBase-class.html">MIEEBase</a></li>
+      <li><a href="fake/MIEEMixin-class.html">MIEEMixin</a></li>
+      <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
+      <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
+      <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
+      <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
+      <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
+      <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
+      <li><a href="fake/ReferringClass-class.html">ReferringClass</a></li>
+      <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+      <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
+      <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
+      <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
+      <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
+      <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
+      <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
+      <li><a href="fake/CUSTOM_CLASS_PRIVATE-constant.html">CUSTOM_CLASS_PRIVATE</a></li>
+      <li><a class="deprecated" href="fake/DOWN-constant.html">DOWN</a></li>
+      <li><a href="fake/greatAnnotation-constant.html">greatAnnotation</a></li>
+      <li><a href="fake/greatestAnnotation-constant.html">greatestAnnotation</a></li>
+      <li><a href="fake/incorrectDocReference-constant.html">incorrectDocReference</a></li>
+      <li><a href="fake/myMap-constant.html">myMap</a></li>
+      <li><a href="fake/NAME_SINGLEUNDERSCORE-constant.html">NAME_SINGLEUNDERSCORE</a></li>
+      <li><a href="fake/NAME_WITH_TWO_UNDERSCORES-constant.html">NAME_WITH_TWO_UNDERSCORES</a></li>
+      <li><a href="fake/PI-constant.html">PI</a></li>
+      <li><a href="fake/required-constant.html">required</a></li>
+      <li><a href="fake/testingCodeSyntaxInOneLiners-constant.html">testingCodeSyntaxInOneLiners</a></li>
+      <li><a href="fake/UP-constant.html">UP</a></li>
+      <li><a href="fake/ZERO-constant.html">ZERO</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
+      <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
+      <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
+      <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
+      <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
+      <li><a href="fake/justGetter.html">justGetter</a></li>
+      <li><a href="fake/justSetter.html">justSetter</a></li>
+      <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
+      <li><a class="deprecated" href="fake/meaningOfLife.html">meaningOfLife</a></li>
+      <li><a href="fake/mustGetThis.html">mustGetThis</a></li>
+      <li><a href="fake/setAndGet.html">setAndGet</a></li>
+      <li><a href="fake/simpleProperty.html">simpleProperty</a></li>
+      <li><a href="fake/useSomethingInAnotherPackage.html">useSomethingInAnotherPackage</a></li>
+      <li><a href="fake/useSomethingInTheSdk.html">useSomethingInTheSdk</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#functions">Functions</a></li>
+      <li><a href="fake/addCallback.html">addCallback</a></li>
+      <li><a href="fake/addCallback2.html">addCallback2</a></li>
+      <li><a href="fake/aVoidParameter.html">aVoidParameter</a></li>
+      <li><a href="fake/functionWithFunctionParameters.html">functionWithFunctionParameters</a></li>
+      <li><a href="fake/myGenericFunction.html">myGenericFunction</a></li>
+      <li><a href="fake/onlyPositionalWithNoDefaultNoType.html">onlyPositionalWithNoDefaultNoType</a></li>
+      <li><a href="fake/paintImage1.html">paintImage1</a></li>
+      <li><a href="fake/paintImage2.html">paintImage2</a></li>
+      <li><a href="fake/paramFromAnotherLib.html">paramFromAnotherLib</a></li>
+      <li><a href="fake/paramOfFutureOrNull.html">paramOfFutureOrNull</a></li>
+      <li><a href="fake/returningFutureVoid.html">returningFutureVoid</a></li>
+      <li><a href="fake/short.html">short</a></li>
+      <li><a href="fake/soIntense.html">soIntense</a></li>
+      <li><a href="fake/thisIsAlsoAsync.html">thisIsAlsoAsync</a></li>
+      <li><a href="fake/thisIsAsync.html">thisIsAsync</a></li>
+      <li><a href="fake/thisIsFutureOr.html">thisIsFutureOr</a></li>
+      <li><a href="fake/thisIsFutureOrNull.html">thisIsFutureOrNull</a></li>
+      <li><a href="fake/thisIsFutureOrT.html">thisIsFutureOrT</a></li>
+      <li><a class="deprecated" href="fake/topLevelFunction.html">topLevelFunction</a></li>
+      <li><a href="fake/typeParamOfFutureOr.html">typeParamOfFutureOr</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#enums">Enums</a></li>
+      <li><a href="fake/Color-class.html">Color</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#typedefs">Typedefs</a></li>
+      <li><a href="fake/Callback2.html">Callback2</a></li>
+      <li><a class="deprecated" href="fake/FakeProcesses.html">FakeProcesses</a></li>
+      <li><a href="fake/GenericTypedef.html">GenericTypedef</a></li>
+      <li><a href="fake/LotsAndLotsOfParameters.html">LotsAndLotsOfParameters</a></li>
+      <li><a href="fake/myCoolTypedef.html">myCoolTypedef</a></li>
+      <li><a href="fake/NewGenericTypedef.html">NewGenericTypedef</a></li>
+      <li><a href="fake/VoidCallback.html">VoidCallback</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#exceptions">Exceptions</a></li>
+      <li><a class="deprecated" href="fake/Doh-class.html">Doh</a></li>
+      <li><a href="fake/Oops-class.html">Oops</a></li>
+    </ol>
+  </div>
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+      <h1>NewStyleMixinCallingSuper mixin </h1>
+
+    <section class="desc markdown">
+      <p>I am a new style mixin using the new mixin syntax.</p>
+    </section>
+    
+    <section>
+      <dl class="dl-horizontal">
+        <dt>Superclass Constraints</dt>
+        <dd><ul class="comma-separated dark mixin-relationships">
+          <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
+        </ul></dd>
+
+
+
+
+        <dt>Implemented by</dt>
+        <dd><ul class="comma-separated mixin-relationships">
+          <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
+        </ul></dd>
+
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor" id="constructors">
+      <h2>Constructors</h2>
+
+      <dl class="constructor-summary-list">
+        <dt id="NewStyleMixinCallingSuper" class="callable">
+          <span class="name"><a href="fake/NewStyleMixinCallingSuper/NewStyleMixinCallingSuper.html">NewStyleMixinCallingSuper</a></span><span class="signature">()</span>
+        </dt>
+        <dd>
+          
+        </dd>
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor" id="instance-properties">
+      <h2>Properties</h2>
+
+      <dl class="properties">
+        <dt id="superString" class="property">
+          <span class="name"><a href="fake/NewStyleMixinCallingSuper/superString.html">superString</a></span>
+          <span class="signature">&#8594; String</span> 
+        </dt>
+        <dd>
+          I have documentation for an overridden method named <a href="fake/NewStyleMixinCallingSuper/superString.html">superString</a>,
+different from <a href="fake/NotAMixin/superString.html">NotAMixin.superString</a>.
+          <div class="features">read-only</div>
+</dd>
+        <dt id="hashCode" class="property inherited">
+          <span class="name"><a href="fake/NotAMixin/hashCode.html">hashCode</a></span>
+          <span class="signature">&#8594; int</span> 
+        </dt>
+        <dd class="inherited">
+          
+          <div class="features">read-only, inherited</div>
+</dd>
+        <dt id="runtimeType" class="property inherited">
+          <span class="name"><a href="fake/NotAMixin/runtimeType.html">runtimeType</a></span>
+          <span class="signature">&#8594; Type</span> 
+        </dt>
+        <dd class="inherited">
+          
+          <div class="features">read-only, inherited</div>
+</dd>
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor inherited" id="instance-methods">
+      <h2>Methods</h2>
+      <dl class="callables">
+        <dt id="noSuchMethod" class="callable inherited">
+          <span class="name"><a href="fake/NotAMixin/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
+            <span class="returntype parameter">&#8594; dynamic</span>
+          </span>
+          </dt>
+        <dd class="inherited">
+          
+          <div class="features">inherited</div>
+</dd>
+        <dt id="toString" class="callable inherited">
+          <span class="name"><a href="fake/NotAMixin/toString.html">toString</a></span><span class="signature">(<wbr>)
+            <span class="returntype parameter">&#8594; String</span>
+          </span>
+          </dt>
+        <dd class="inherited">
+          
+          <div class="features">inherited</div>
+</dd>
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor inherited" id="operators">
+      <h2>Operators</h2>
+      <dl class="callables">
+        <dt id="operator ==" class="callable inherited">
+          <span class="name"><a href="fake/NotAMixin/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
+            <span class="returntype parameter">&#8594; bool</span>
+          </span>
+          </dt>
+        <dd class="inherited">
+          
+          <div class="features">inherited</div>
+</dd>
+      </dl>
+    </section>
+
+
+
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+    <ol>
+      <li class="section-title"><a href="fake/NewStyleMixinCallingSuper-mixin.html#constructors">Constructors</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper/NewStyleMixinCallingSuper.html">NewStyleMixinCallingSuper</a></li>
+    
+      <li class="section-title">
+        <a href="fake/NewStyleMixinCallingSuper-mixin.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/NewStyleMixinCallingSuper/superString.html">superString</a></li>
+      <li class="inherited"><a href="fake/NotAMixin/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/NotAMixin/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/NewStyleMixinCallingSuper-mixin.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/NotAMixin/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/NotAMixin/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/NewStyleMixinCallingSuper-mixin.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/NotAMixin/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs/fake/NewStyleMixinCallingSuper/NewStyleMixinCallingSuper.html b/testing/test_package_docs/fake/NewStyleMixinCallingSuper/NewStyleMixinCallingSuper.html
new file mode 100644
index 0000000000..32a75659c9
--- /dev/null
+++ b/testing/test_package_docs/fake/NewStyleMixinCallingSuper/NewStyleMixinCallingSuper.html
@@ -0,0 +1,98 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the NewStyleMixinCallingSuper constructor from the Mixin NewStyleMixinCallingSuper class from the fake library, for the Dart programming language.">
+  <title>NewStyleMixinCallingSuper constructor - NewStyleMixinCallingSuper class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    <li class="self-crumb">NewStyleMixinCallingSuper constructor</li>
+  </ol>
+  <div class="self-name">NewStyleMixinCallingSuper</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>NewStyleMixinCallingSuper mixin</h5>
+    <ol>
+      <li class="section-title"><a href="fake/NewStyleMixinCallingSuper-mixin.html#constructors">Constructors</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper/NewStyleMixinCallingSuper.html">NewStyleMixinCallingSuper</a></li>
+    
+      <li class="section-title">
+        <a href="fake/NewStyleMixinCallingSuper-mixin.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/NewStyleMixinCallingSuper/superString.html">superString</a></li>
+      <li class="inherited"><a href="fake/NotAMixin/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/NotAMixin/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/NewStyleMixinCallingSuper-mixin.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/NotAMixin/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/NotAMixin/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/NewStyleMixinCallingSuper-mixin.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/NotAMixin/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-left-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>NewStyleMixinCallingSuper constructor</h1>
+
+    <section class="multi-line-signature">
+      
+      <span class="name ">NewStyleMixinCallingSuper</span>(<wbr>)
+    </section>
+
+    
+    
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs/fake/NewStyleMixinCallingSuper/superString.html b/testing/test_package_docs/fake/NewStyleMixinCallingSuper/superString.html
new file mode 100644
index 0000000000..fd52e90b30
--- /dev/null
+++ b/testing/test_package_docs/fake/NewStyleMixinCallingSuper/superString.html
@@ -0,0 +1,106 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the superString property from the NewStyleMixinCallingSuper class, for the Dart programming language.">
+  <title>superString property - NewStyleMixinCallingSuper class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    <li class="self-crumb">superString property</li>
+  </ol>
+  <div class="self-name">superString</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>NewStyleMixinCallingSuper mixin</h5>
+    <ol>
+      <li class="section-title"><a href="fake/NewStyleMixinCallingSuper-mixin.html#constructors">Constructors</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper/NewStyleMixinCallingSuper.html">NewStyleMixinCallingSuper</a></li>
+    
+      <li class="section-title">
+        <a href="fake/NewStyleMixinCallingSuper-mixin.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/NewStyleMixinCallingSuper/superString.html">superString</a></li>
+      <li class="inherited"><a href="fake/NotAMixin/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/NotAMixin/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/NewStyleMixinCallingSuper-mixin.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/NotAMixin/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/NotAMixin/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/NewStyleMixinCallingSuper-mixin.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/NotAMixin/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>superString property</h1>
+
+
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">String</span>
+          <span class="name ">superString</span>
+  
+</section>
+        
+        <section class="desc markdown">
+  <p>I have documentation for an overridden method named <a href="fake/NewStyleMixinCallingSuper/superString.html">superString</a>,
+different from <a href="fake/NotAMixin/superString.html">NotAMixin.superString</a>.</p>
+</section>
+
+</section>
+        
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs/fake/NotAMixin-class.html b/testing/test_package_docs/fake/NotAMixin-class.html
index ec51b9706e..c2ac8bd837 100644
--- a/testing/test_package_docs/fake/NotAMixin-class.html
+++ b/testing/test_package_docs/fake/NotAMixin-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
@@ -170,6 +178,7 @@ <h1>NotAMixin class </h1>
 
         <dt>Implementers</dt>
         <dd><ul class="comma-separated clazz-relationships">
+          <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
           <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
         </ul></dd>
 
diff --git a/testing/test_package_docs/fake/Oops-class.html b/testing/test_package_docs/fake/Oops-class.html
index 2f77a02f03..b9341e4a59 100644
--- a/testing/test_package_docs/fake/Oops-class.html
+++ b/testing/test_package_docs/fake/Oops-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/OperatorReferenceClass-class.html b/testing/test_package_docs/fake/OperatorReferenceClass-class.html
index f8517fe13f..ae0fbaf40f 100644
--- a/testing/test_package_docs/fake/OperatorReferenceClass-class.html
+++ b/testing/test_package_docs/fake/OperatorReferenceClass-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/OtherGenericsThing-class.html b/testing/test_package_docs/fake/OtherGenericsThing-class.html
index 17de2ff97b..6f3e56aa84 100644
--- a/testing/test_package_docs/fake/OtherGenericsThing-class.html
+++ b/testing/test_package_docs/fake/OtherGenericsThing-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/PI-constant.html b/testing/test_package_docs/fake/PI-constant.html
index a12cff97f3..2ec1300b5e 100644
--- a/testing/test_package_docs/fake/PI-constant.html
+++ b/testing/test_package_docs/fake/PI-constant.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/ReferringClass-class.html b/testing/test_package_docs/fake/ReferringClass-class.html
index 3093f02230..8dc9c5c0f4 100644
--- a/testing/test_package_docs/fake/ReferringClass-class.html
+++ b/testing/test_package_docs/fake/ReferringClass-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList-class.html b/testing/test_package_docs/fake/SpecialList-class.html
index b399a2e799..8fee4805aa 100644
--- a/testing/test_package_docs/fake/SpecialList-class.html
+++ b/testing/test_package_docs/fake/SpecialList-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/SubForDocComments-class.html b/testing/test_package_docs/fake/SubForDocComments-class.html
index 6e24cb5a59..8537b5db99 100644
--- a/testing/test_package_docs/fake/SubForDocComments-class.html
+++ b/testing/test_package_docs/fake/SubForDocComments-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/SuperAwesomeClass-class.html b/testing/test_package_docs/fake/SuperAwesomeClass-class.html
index 178d626081..e8f94f4fbd 100644
--- a/testing/test_package_docs/fake/SuperAwesomeClass-class.html
+++ b/testing/test_package_docs/fake/SuperAwesomeClass-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/TypeInferenceMixedIn-class.html b/testing/test_package_docs/fake/TypeInferenceMixedIn-class.html
new file mode 100644
index 0000000000..feace494fb
--- /dev/null
+++ b/testing/test_package_docs/fake/TypeInferenceMixedIn-class.html
@@ -0,0 +1,381 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the TypeInferenceMixedIn class from the fake library, for the Dart programming language.">
+  <title>TypeInferenceMixedIn class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li class="self-crumb">TypeInferenceMixedIn class</li>
+  </ol>
+  <div class="self-name">TypeInferenceMixedIn</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>fake library</h5>
+    <ol>
+      <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
+      <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
+      <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
+      <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
+      <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
+      <li><a href="fake/Annotation-class.html">Annotation</a></li>
+      <li><a href="fake/AnotherInterface-class.html">AnotherInterface</a></li>
+      <li><a href="fake/ATypeTakingClass-class.html">ATypeTakingClass</a></li>
+      <li><a href="fake/ATypeTakingClassMixedIn-class.html">ATypeTakingClassMixedIn</a></li>
+      <li><a href="fake/BaseForDocComments-class.html">BaseForDocComments</a></li>
+      <li><a href="fake/BaseThingy-class.html">BaseThingy</a></li>
+      <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
+      <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
+      <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
+      <li><a href="fake/Cool-class.html">Cool</a></li>
+      <li><a href="fake/DocumentWithATable-class.html">DocumentWithATable</a></li>
+      <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
+      <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
+      <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
+      <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
+      <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
+      <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
+      <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
+      <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
+      <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
+      <li><a href="fake/ImplicitProperties-class.html">ImplicitProperties</a></li>
+      <li><a href="fake/InheritingClassOne-class.html">InheritingClassOne</a></li>
+      <li><a href="fake/InheritingClassTwo-class.html">InheritingClassTwo</a></li>
+      <li><a href="fake/Interface-class.html">Interface</a></li>
+      <li><a href="fake/LongFirstLine-class.html">LongFirstLine</a></li>
+      <li><a href="fake/MIEEBase-class.html">MIEEBase</a></li>
+      <li><a href="fake/MIEEMixin-class.html">MIEEMixin</a></li>
+      <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
+      <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
+      <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
+      <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
+      <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
+      <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
+      <li><a href="fake/ReferringClass-class.html">ReferringClass</a></li>
+      <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+      <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
+      <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
+      <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
+      <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
+      <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
+      <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
+      <li><a href="fake/CUSTOM_CLASS_PRIVATE-constant.html">CUSTOM_CLASS_PRIVATE</a></li>
+      <li><a class="deprecated" href="fake/DOWN-constant.html">DOWN</a></li>
+      <li><a href="fake/greatAnnotation-constant.html">greatAnnotation</a></li>
+      <li><a href="fake/greatestAnnotation-constant.html">greatestAnnotation</a></li>
+      <li><a href="fake/incorrectDocReference-constant.html">incorrectDocReference</a></li>
+      <li><a href="fake/myMap-constant.html">myMap</a></li>
+      <li><a href="fake/NAME_SINGLEUNDERSCORE-constant.html">NAME_SINGLEUNDERSCORE</a></li>
+      <li><a href="fake/NAME_WITH_TWO_UNDERSCORES-constant.html">NAME_WITH_TWO_UNDERSCORES</a></li>
+      <li><a href="fake/PI-constant.html">PI</a></li>
+      <li><a href="fake/required-constant.html">required</a></li>
+      <li><a href="fake/testingCodeSyntaxInOneLiners-constant.html">testingCodeSyntaxInOneLiners</a></li>
+      <li><a href="fake/UP-constant.html">UP</a></li>
+      <li><a href="fake/ZERO-constant.html">ZERO</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
+      <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
+      <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
+      <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
+      <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
+      <li><a href="fake/justGetter.html">justGetter</a></li>
+      <li><a href="fake/justSetter.html">justSetter</a></li>
+      <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
+      <li><a class="deprecated" href="fake/meaningOfLife.html">meaningOfLife</a></li>
+      <li><a href="fake/mustGetThis.html">mustGetThis</a></li>
+      <li><a href="fake/setAndGet.html">setAndGet</a></li>
+      <li><a href="fake/simpleProperty.html">simpleProperty</a></li>
+      <li><a href="fake/useSomethingInAnotherPackage.html">useSomethingInAnotherPackage</a></li>
+      <li><a href="fake/useSomethingInTheSdk.html">useSomethingInTheSdk</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#functions">Functions</a></li>
+      <li><a href="fake/addCallback.html">addCallback</a></li>
+      <li><a href="fake/addCallback2.html">addCallback2</a></li>
+      <li><a href="fake/aVoidParameter.html">aVoidParameter</a></li>
+      <li><a href="fake/functionWithFunctionParameters.html">functionWithFunctionParameters</a></li>
+      <li><a href="fake/myGenericFunction.html">myGenericFunction</a></li>
+      <li><a href="fake/onlyPositionalWithNoDefaultNoType.html">onlyPositionalWithNoDefaultNoType</a></li>
+      <li><a href="fake/paintImage1.html">paintImage1</a></li>
+      <li><a href="fake/paintImage2.html">paintImage2</a></li>
+      <li><a href="fake/paramFromAnotherLib.html">paramFromAnotherLib</a></li>
+      <li><a href="fake/paramOfFutureOrNull.html">paramOfFutureOrNull</a></li>
+      <li><a href="fake/returningFutureVoid.html">returningFutureVoid</a></li>
+      <li><a href="fake/short.html">short</a></li>
+      <li><a href="fake/soIntense.html">soIntense</a></li>
+      <li><a href="fake/thisIsAlsoAsync.html">thisIsAlsoAsync</a></li>
+      <li><a href="fake/thisIsAsync.html">thisIsAsync</a></li>
+      <li><a href="fake/thisIsFutureOr.html">thisIsFutureOr</a></li>
+      <li><a href="fake/thisIsFutureOrNull.html">thisIsFutureOrNull</a></li>
+      <li><a href="fake/thisIsFutureOrT.html">thisIsFutureOrT</a></li>
+      <li><a class="deprecated" href="fake/topLevelFunction.html">topLevelFunction</a></li>
+      <li><a href="fake/typeParamOfFutureOr.html">typeParamOfFutureOr</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#enums">Enums</a></li>
+      <li><a href="fake/Color-class.html">Color</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#typedefs">Typedefs</a></li>
+      <li><a href="fake/Callback2.html">Callback2</a></li>
+      <li><a class="deprecated" href="fake/FakeProcesses.html">FakeProcesses</a></li>
+      <li><a href="fake/GenericTypedef.html">GenericTypedef</a></li>
+      <li><a href="fake/LotsAndLotsOfParameters.html">LotsAndLotsOfParameters</a></li>
+      <li><a href="fake/myCoolTypedef.html">myCoolTypedef</a></li>
+      <li><a href="fake/NewGenericTypedef.html">NewGenericTypedef</a></li>
+      <li><a href="fake/VoidCallback.html">VoidCallback</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#exceptions">Exceptions</a></li>
+      <li><a class="deprecated" href="fake/Doh-class.html">Doh</a></li>
+      <li><a href="fake/Oops-class.html">Oops</a></li>
+    </ol>
+  </div>
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+      <h1>TypeInferenceMixedIn class </h1>
+
+    <section class="desc markdown">
+      <p>A class verifying type inference across new-style mixins.</p>
+    </section>
+    
+    <section>
+      <dl class="dl-horizontal">
+        <dt>Inheritance</dt>
+        <dd><ul class="gt-separated dark clazz-relationships">
+          <li>Object</li>
+          <li><a href="fake/GenericClass-class.html">GenericClass</a><span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></li>
+          <li><a href="fake/ModifierClass-class.html">ModifierClass</a><span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></li>
+          <li>TypeInferenceMixedIn</li>
+        </ul></dd>
+
+
+        <dt>Mixed in types</dt>
+        <dd><ul class="comma-separated clazz-relationships">
+          <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a><span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></li>
+        </ul></dd>
+
+
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor" id="constructors">
+      <h2>Constructors</h2>
+
+      <dl class="constructor-summary-list">
+        <dt id="TypeInferenceMixedIn" class="callable">
+          <span class="name"><a href="fake/TypeInferenceMixedIn/TypeInferenceMixedIn.html">TypeInferenceMixedIn</a></span><span class="signature">()</span>
+        </dt>
+        <dd>
+          
+        </dd>
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor" id="instance-properties">
+      <h2>Properties</h2>
+
+      <dl class="properties">
+        <dt id="overrideByEverything" class="property">
+          <span class="name"><a href="fake/TypeInferenceMixedIn/overrideByEverything.html">overrideByEverything</a></span>
+          <span class="signature">&#8596; int</span> 
+        </dt>
+        <dd>
+          Destined to be overridden by everything.
+          <div class="features">read / write</div>
+</dd>
+        <dt id="hashCode" class="property inherited">
+          <span class="name"><a href="fake/GenericClass/hashCode.html">hashCode</a></span>
+          <span class="signature">&#8594; int</span> 
+        </dt>
+        <dd class="inherited">
+          
+          <div class="features">read-only, inherited</div>
+</dd>
+        <dt id="member" class="property inherited">
+          <span class="name"><a href="fake/GenericClass/member.html">member</a></span>
+          <span class="signature">&#8596; int</span> 
+        </dt>
+        <dd class="inherited">
+          
+          <div class="features">read / write, inherited</div>
+</dd>
+        <dt id="mixinMember" class="property inherited">
+          <span class="name"><a href="fake/GenericMixin/mixinMember.html">mixinMember</a></span>
+          <span class="signature">&#8596; int</span> 
+        </dt>
+        <dd class="inherited">
+          
+          <div class="features">read / write, inherited</div>
+</dd>
+        <dt id="modifierMember" class="property inherited">
+          <span class="name"><a href="fake/ModifierClass/modifierMember.html">modifierMember</a></span>
+          <span class="signature">&#8596; int</span> 
+        </dt>
+        <dd class="inherited">
+          
+          <div class="features">read / write, inherited</div>
+</dd>
+        <dt id="overrideByBoth" class="property inherited">
+          <span class="name"><a href="fake/GenericMixin/overrideByBoth.html">overrideByBoth</a></span>
+          <span class="signature">&#8596; int</span> 
+        </dt>
+        <dd class="inherited">
+          Destined to be overridden by <a href="fake/ModifierClass-class.html">ModifierClass</a> and <a href="fake/GenericMixin-mixin.html">GenericMixin</a>, both.
+          <div class="features">read / write, inherited</div>
+</dd>
+        <dt id="overrideByGenericMixin" class="property inherited">
+          <span class="name"><a href="fake/GenericMixin/overrideByGenericMixin.html">overrideByGenericMixin</a></span>
+          <span class="signature">&#8596; int</span> 
+        </dt>
+        <dd class="inherited">
+          Destined to be overridden by <a href="fake/GenericMixin-mixin.html">GenericMixin</a>.
+          <div class="features">read / write, inherited</div>
+</dd>
+        <dt id="overrideByModifierClass" class="property inherited">
+          <span class="name"><a href="fake/ModifierClass/overrideByModifierClass.html">overrideByModifierClass</a></span>
+          <span class="signature">&#8596; int</span> 
+        </dt>
+        <dd class="inherited">
+          Destined to be overridden by <a href="fake/ModifierClass-class.html">ModifierClass</a>.
+          <div class="features">read / write, inherited</div>
+</dd>
+        <dt id="runtimeType" class="property inherited">
+          <span class="name"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></span>
+          <span class="signature">&#8594; Type</span> 
+        </dt>
+        <dd class="inherited">
+          
+          <div class="features">read-only, inherited</div>
+</dd>
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor inherited" id="instance-methods">
+      <h2>Methods</h2>
+      <dl class="callables">
+        <dt id="noSuchMethod" class="callable inherited">
+          <span class="name"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
+            <span class="returntype parameter">&#8594; dynamic</span>
+          </span>
+          </dt>
+        <dd class="inherited">
+          
+          <div class="features">inherited</div>
+</dd>
+        <dt id="toString" class="callable inherited">
+          <span class="name"><a href="fake/GenericClass/toString.html">toString</a></span><span class="signature">(<wbr>)
+            <span class="returntype parameter">&#8594; String</span>
+          </span>
+          </dt>
+        <dd class="inherited">
+          
+          <div class="features">inherited</div>
+</dd>
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor inherited" id="operators">
+      <h2>Operators</h2>
+      <dl class="callables">
+        <dt id="operator ==" class="callable inherited">
+          <span class="name"><a href="fake/GenericClass/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
+            <span class="returntype parameter">&#8594; bool</span>
+          </span>
+          </dt>
+        <dd class="inherited">
+          
+          <div class="features">inherited</div>
+</dd>
+      </dl>
+    </section>
+
+
+
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+    <ol>
+      <li class="section-title"><a href="fake/TypeInferenceMixedIn-class.html#constructors">Constructors</a></li>
+      <li><a href="fake/TypeInferenceMixedIn/TypeInferenceMixedIn.html">TypeInferenceMixedIn</a></li>
+    
+      <li class="section-title">
+        <a href="fake/TypeInferenceMixedIn-class.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/TypeInferenceMixedIn/overrideByEverything.html">overrideByEverything</a></li>
+      <li class="inherited"><a href="fake/GenericClass/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/GenericClass/member.html">member</a></li>
+      <li class="inherited"><a href="fake/GenericMixin/mixinMember.html">mixinMember</a></li>
+      <li class="inherited"><a href="fake/ModifierClass/modifierMember.html">modifierMember</a></li>
+      <li class="inherited"><a href="fake/GenericMixin/overrideByBoth.html">overrideByBoth</a></li>
+      <li class="inherited"><a href="fake/GenericMixin/overrideByGenericMixin.html">overrideByGenericMixin</a></li>
+      <li class="inherited"><a href="fake/ModifierClass/overrideByModifierClass.html">overrideByModifierClass</a></li>
+      <li class="inherited"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/TypeInferenceMixedIn-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/GenericClass/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/TypeInferenceMixedIn-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/GenericClass/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs/fake/TypeInferenceMixedIn/TypeInferenceMixedIn.html b/testing/test_package_docs/fake/TypeInferenceMixedIn/TypeInferenceMixedIn.html
new file mode 100644
index 0000000000..283cf31f8b
--- /dev/null
+++ b/testing/test_package_docs/fake/TypeInferenceMixedIn/TypeInferenceMixedIn.html
@@ -0,0 +1,104 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the TypeInferenceMixedIn constructor from the Class TypeInferenceMixedIn class from the fake library, for the Dart programming language.">
+  <title>TypeInferenceMixedIn constructor - TypeInferenceMixedIn class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
+    <li class="self-crumb">TypeInferenceMixedIn constructor</li>
+  </ol>
+  <div class="self-name">TypeInferenceMixedIn</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>TypeInferenceMixedIn class</h5>
+    <ol>
+      <li class="section-title"><a href="fake/TypeInferenceMixedIn-class.html#constructors">Constructors</a></li>
+      <li><a href="fake/TypeInferenceMixedIn/TypeInferenceMixedIn.html">TypeInferenceMixedIn</a></li>
+    
+      <li class="section-title">
+        <a href="fake/TypeInferenceMixedIn-class.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/TypeInferenceMixedIn/overrideByEverything.html">overrideByEverything</a></li>
+      <li class="inherited"><a href="fake/GenericClass/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/GenericClass/member.html">member</a></li>
+      <li class="inherited"><a href="fake/GenericMixin/mixinMember.html">mixinMember</a></li>
+      <li class="inherited"><a href="fake/ModifierClass/modifierMember.html">modifierMember</a></li>
+      <li class="inherited"><a href="fake/GenericMixin/overrideByBoth.html">overrideByBoth</a></li>
+      <li class="inherited"><a href="fake/GenericMixin/overrideByGenericMixin.html">overrideByGenericMixin</a></li>
+      <li class="inherited"><a href="fake/ModifierClass/overrideByModifierClass.html">overrideByModifierClass</a></li>
+      <li class="inherited"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/TypeInferenceMixedIn-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/GenericClass/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/TypeInferenceMixedIn-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/GenericClass/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-left-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>TypeInferenceMixedIn constructor</h1>
+
+    <section class="multi-line-signature">
+      
+      <span class="name ">TypeInferenceMixedIn</span>(<wbr>)
+    </section>
+
+    
+    
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs/fake/TypeInferenceMixedIn/overrideByEverything.html b/testing/test_package_docs/fake/TypeInferenceMixedIn/overrideByEverything.html
new file mode 100644
index 0000000000..3caf9cd554
--- /dev/null
+++ b/testing/test_package_docs/fake/TypeInferenceMixedIn/overrideByEverything.html
@@ -0,0 +1,106 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the overrideByEverything property from the TypeInferenceMixedIn class, for the Dart programming language.">
+  <title>overrideByEverything property - TypeInferenceMixedIn class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
+    <li class="self-crumb">overrideByEverything property</li>
+  </ol>
+  <div class="self-name">overrideByEverything</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>TypeInferenceMixedIn class</h5>
+    <ol>
+      <li class="section-title"><a href="fake/TypeInferenceMixedIn-class.html#constructors">Constructors</a></li>
+      <li><a href="fake/TypeInferenceMixedIn/TypeInferenceMixedIn.html">TypeInferenceMixedIn</a></li>
+    
+      <li class="section-title">
+        <a href="fake/TypeInferenceMixedIn-class.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/TypeInferenceMixedIn/overrideByEverything.html">overrideByEverything</a></li>
+      <li class="inherited"><a href="fake/GenericClass/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/GenericClass/member.html">member</a></li>
+      <li class="inherited"><a href="fake/GenericMixin/mixinMember.html">mixinMember</a></li>
+      <li class="inherited"><a href="fake/ModifierClass/modifierMember.html">modifierMember</a></li>
+      <li class="inherited"><a href="fake/GenericMixin/overrideByBoth.html">overrideByBoth</a></li>
+      <li class="inherited"><a href="fake/GenericMixin/overrideByGenericMixin.html">overrideByGenericMixin</a></li>
+      <li class="inherited"><a href="fake/ModifierClass/overrideByModifierClass.html">overrideByModifierClass</a></li>
+      <li class="inherited"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/TypeInferenceMixedIn-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/GenericClass/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/TypeInferenceMixedIn-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/GenericClass/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>overrideByEverything property</h1>
+
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">overrideByEverything</span>
+          <div class="features">read / write</div>
+        </section>
+        <section class="desc markdown">
+          <p>Destined to be overridden by everything.</p>
+        </section>
+                
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs/fake/TypedefUsingClass-class.html b/testing/test_package_docs/fake/TypedefUsingClass-class.html
index ef8f669211..9aa533e659 100644
--- a/testing/test_package_docs/fake/TypedefUsingClass-class.html
+++ b/testing/test_package_docs/fake/TypedefUsingClass-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/UP-constant.html b/testing/test_package_docs/fake/UP-constant.html
index d0564baa57..a471595979 100644
--- a/testing/test_package_docs/fake/UP-constant.html
+++ b/testing/test_package_docs/fake/UP-constant.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/VoidCallback.html b/testing/test_package_docs/fake/VoidCallback.html
index 6ae946acdd..e6313ef4bf 100644
--- a/testing/test_package_docs/fake/VoidCallback.html
+++ b/testing/test_package_docs/fake/VoidCallback.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/WithGetterAndSetter-class.html b/testing/test_package_docs/fake/WithGetterAndSetter-class.html
index 6b6541f818..a3cecc7d2c 100644
--- a/testing/test_package_docs/fake/WithGetterAndSetter-class.html
+++ b/testing/test_package_docs/fake/WithGetterAndSetter-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/ZERO-constant.html b/testing/test_package_docs/fake/ZERO-constant.html
index 5d97d74a95..de683959d9 100644
--- a/testing/test_package_docs/fake/ZERO-constant.html
+++ b/testing/test_package_docs/fake/ZERO-constant.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/aCoolVariable.html b/testing/test_package_docs/fake/aCoolVariable.html
index 093466907b..7a835a2615 100644
--- a/testing/test_package_docs/fake/aCoolVariable.html
+++ b/testing/test_package_docs/fake/aCoolVariable.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/aVoidParameter.html b/testing/test_package_docs/fake/aVoidParameter.html
index 9627057c68..f860dd8f83 100644
--- a/testing/test_package_docs/fake/aVoidParameter.html
+++ b/testing/test_package_docs/fake/aVoidParameter.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/addCallback.html b/testing/test_package_docs/fake/addCallback.html
index f7c22d0d8b..cad6bfe8eb 100644
--- a/testing/test_package_docs/fake/addCallback.html
+++ b/testing/test_package_docs/fake/addCallback.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/addCallback2.html b/testing/test_package_docs/fake/addCallback2.html
index 03917fde7d..fa98a3f2f4 100644
--- a/testing/test_package_docs/fake/addCallback2.html
+++ b/testing/test_package_docs/fake/addCallback2.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/bulletDoced-constant.html b/testing/test_package_docs/fake/bulletDoced-constant.html
index b4158fe434..ffdb9ac303 100644
--- a/testing/test_package_docs/fake/bulletDoced-constant.html
+++ b/testing/test_package_docs/fake/bulletDoced-constant.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/complicatedReturn.html b/testing/test_package_docs/fake/complicatedReturn.html
index cc0fcdc7de..11e69ef63e 100644
--- a/testing/test_package_docs/fake/complicatedReturn.html
+++ b/testing/test_package_docs/fake/complicatedReturn.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/dynamicGetter.html b/testing/test_package_docs/fake/dynamicGetter.html
index 0ec4826ab5..e587e0a86d 100644
--- a/testing/test_package_docs/fake/dynamicGetter.html
+++ b/testing/test_package_docs/fake/dynamicGetter.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/fake-library.html b/testing/test_package_docs/fake/fake-library.html
index 8bf037b392..6fa1ba5ea6 100644
--- a/testing/test_package_docs/fake/fake-library.html
+++ b/testing/test_package_docs/fake/fake-library.html
@@ -104,6 +104,12 @@ <h2>Classes</h2>
         <dd>
           Verify super-mixins don't break Dartdoc.
         </dd>
+        <dt id="AClassUsingNewStyleMixin">
+          <span class="name "><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></span> 
+        </dt>
+        <dd>
+          A class mixing in a single new-style mixin.
+        </dd>
         <dt id="AClassWithFancyProperties">
           <span class="name "><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></span> 
         </dt>
@@ -208,6 +214,12 @@ <h2>Classes</h2>
         <dd>
           link to method from class <a href="ex/Apple/m.html">Apple.m</a>
         </dd>
+        <dt id="GenericClass">
+          <span class="name "><a href="fake/GenericClass-class.html">GenericClass</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span> 
+        </dt>
+        <dd>
+          A generic class for testing type inference.
+        </dd>
         <dt id="HasGenerics">
           <span class="name "><a href="fake/HasGenerics-class.html">HasGenerics</a><span class="signature">&lt;<wbr><span class="type-parameter">X</span>, <span class="type-parameter">Y</span>, <span class="type-parameter">Z</span>&gt;</span></span> 
         </dt>
@@ -315,6 +327,12 @@ <h2>Classes</h2>
         <dd>
           Perfect for mix-ins.
         </dd>
+        <dt id="ModifierClass">
+          <span class="name "><a href="fake/ModifierClass-class.html">ModifierClass</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span> 
+        </dt>
+        <dd>
+          A class extending a generic class.
+        </dd>
         <dt id="NotAMixin">
           <span class="name "><a href="fake/NotAMixin-class.html">NotAMixin</a></span> 
         </dt>
@@ -362,6 +380,12 @@ <h2>Classes</h2>
         </dt>
         <dd>
           
+        </dd>
+        <dt id="TypeInferenceMixedIn">
+          <span class="name "><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></span> 
+        </dt>
+        <dd>
+          A class verifying type inference across new-style mixins.
         </dd>
         <dt id="WithGetterAndSetter">
           <span class="name "><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></span> 
@@ -372,6 +396,25 @@ <h2>Classes</h2>
       </dl>
     </section>
 
+    <section class="summary offset-anchor" id="mixins">
+      <h2>Mixins</h2>
+
+      <dl>
+        <dt id="GenericMixin">
+          <span class="name "><a href="fake/GenericMixin-mixin.html">GenericMixin</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span> 
+        </dt>
+        <dd>
+          A generic mixin that requires GenericClass as a superclass.
+        </dd>
+        <dt id="NewStyleMixinCallingSuper">
+          <span class="name "><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></span> 
+        </dt>
+        <dd>
+          I am a new style mixin using the new mixin syntax.
+        </dd>
+      </dl>
+    </section>
+
     <section class="summary offset-anchor" id="constants">
       <h2>Constants</h2>
 
@@ -970,6 +1013,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -987,6 +1031,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -1004,6 +1049,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -1012,8 +1058,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/functionWithFunctionParameters.html b/testing/test_package_docs/fake/functionWithFunctionParameters.html
index c3a0e73da4..3d1af8dca2 100644
--- a/testing/test_package_docs/fake/functionWithFunctionParameters.html
+++ b/testing/test_package_docs/fake/functionWithFunctionParameters.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/getterSetterNodocGetter.html b/testing/test_package_docs/fake/getterSetterNodocGetter.html
index 8b2f31ec6f..fc39fcefcb 100644
--- a/testing/test_package_docs/fake/getterSetterNodocGetter.html
+++ b/testing/test_package_docs/fake/getterSetterNodocGetter.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/getterSetterNodocSetter.html b/testing/test_package_docs/fake/getterSetterNodocSetter.html
index 4b1ef63dbf..5c8b64193c 100644
--- a/testing/test_package_docs/fake/getterSetterNodocSetter.html
+++ b/testing/test_package_docs/fake/getterSetterNodocSetter.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/greatAnnotation-constant.html b/testing/test_package_docs/fake/greatAnnotation-constant.html
index 5c0a74706e..1b8614f657 100644
--- a/testing/test_package_docs/fake/greatAnnotation-constant.html
+++ b/testing/test_package_docs/fake/greatAnnotation-constant.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/greatestAnnotation-constant.html b/testing/test_package_docs/fake/greatestAnnotation-constant.html
index 84982871b9..f337227d5c 100644
--- a/testing/test_package_docs/fake/greatestAnnotation-constant.html
+++ b/testing/test_package_docs/fake/greatestAnnotation-constant.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/importantComputations.html b/testing/test_package_docs/fake/importantComputations.html
index 7b3bdc7207..72f7d661ab 100644
--- a/testing/test_package_docs/fake/importantComputations.html
+++ b/testing/test_package_docs/fake/importantComputations.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/incorrectDocReference-constant.html b/testing/test_package_docs/fake/incorrectDocReference-constant.html
index 18c059e768..3b1f308aa7 100644
--- a/testing/test_package_docs/fake/incorrectDocReference-constant.html
+++ b/testing/test_package_docs/fake/incorrectDocReference-constant.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/justGetter.html b/testing/test_package_docs/fake/justGetter.html
index 70314b8eaa..2de38dfacd 100644
--- a/testing/test_package_docs/fake/justGetter.html
+++ b/testing/test_package_docs/fake/justGetter.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/justSetter.html b/testing/test_package_docs/fake/justSetter.html
index 24ee98ffcc..f815d7bb95 100644
--- a/testing/test_package_docs/fake/justSetter.html
+++ b/testing/test_package_docs/fake/justSetter.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/mapWithDynamicKeys.html b/testing/test_package_docs/fake/mapWithDynamicKeys.html
index 55037fb4f7..feb952d56a 100644
--- a/testing/test_package_docs/fake/mapWithDynamicKeys.html
+++ b/testing/test_package_docs/fake/mapWithDynamicKeys.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/meaningOfLife.html b/testing/test_package_docs/fake/meaningOfLife.html
index 1807eec8f4..274ccfcac7 100644
--- a/testing/test_package_docs/fake/meaningOfLife.html
+++ b/testing/test_package_docs/fake/meaningOfLife.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/mustGetThis.html b/testing/test_package_docs/fake/mustGetThis.html
index 368f633f9d..08c8e2eb02 100644
--- a/testing/test_package_docs/fake/mustGetThis.html
+++ b/testing/test_package_docs/fake/mustGetThis.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/myCoolTypedef.html b/testing/test_package_docs/fake/myCoolTypedef.html
index d532e9caef..23af06e081 100644
--- a/testing/test_package_docs/fake/myCoolTypedef.html
+++ b/testing/test_package_docs/fake/myCoolTypedef.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/myGenericFunction.html b/testing/test_package_docs/fake/myGenericFunction.html
index 7a2e92b988..57e4423f39 100644
--- a/testing/test_package_docs/fake/myGenericFunction.html
+++ b/testing/test_package_docs/fake/myGenericFunction.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/myMap-constant.html b/testing/test_package_docs/fake/myMap-constant.html
index 861751248d..4184cf9eba 100644
--- a/testing/test_package_docs/fake/myMap-constant.html
+++ b/testing/test_package_docs/fake/myMap-constant.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/onlyPositionalWithNoDefaultNoType.html b/testing/test_package_docs/fake/onlyPositionalWithNoDefaultNoType.html
index b7d81b45f9..704ccca961 100644
--- a/testing/test_package_docs/fake/onlyPositionalWithNoDefaultNoType.html
+++ b/testing/test_package_docs/fake/onlyPositionalWithNoDefaultNoType.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/paintImage1.html b/testing/test_package_docs/fake/paintImage1.html
index 2a0e89410e..0273ff85d6 100644
--- a/testing/test_package_docs/fake/paintImage1.html
+++ b/testing/test_package_docs/fake/paintImage1.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/paintImage2.html b/testing/test_package_docs/fake/paintImage2.html
index 60848b9b10..54caff3147 100644
--- a/testing/test_package_docs/fake/paintImage2.html
+++ b/testing/test_package_docs/fake/paintImage2.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/paramFromAnotherLib.html b/testing/test_package_docs/fake/paramFromAnotherLib.html
index 1afdd83815..29d7652297 100644
--- a/testing/test_package_docs/fake/paramFromAnotherLib.html
+++ b/testing/test_package_docs/fake/paramFromAnotherLib.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/paramOfFutureOrNull.html b/testing/test_package_docs/fake/paramOfFutureOrNull.html
index 3cc766057b..858aced811 100644
--- a/testing/test_package_docs/fake/paramOfFutureOrNull.html
+++ b/testing/test_package_docs/fake/paramOfFutureOrNull.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/required-constant.html b/testing/test_package_docs/fake/required-constant.html
index bd6e264ea1..eaa01ec2bb 100644
--- a/testing/test_package_docs/fake/required-constant.html
+++ b/testing/test_package_docs/fake/required-constant.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/returningFutureVoid.html b/testing/test_package_docs/fake/returningFutureVoid.html
index 1b20e89c2d..8a69ec420c 100644
--- a/testing/test_package_docs/fake/returningFutureVoid.html
+++ b/testing/test_package_docs/fake/returningFutureVoid.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/setAndGet.html b/testing/test_package_docs/fake/setAndGet.html
index 56dca5d1e8..d955a32681 100644
--- a/testing/test_package_docs/fake/setAndGet.html
+++ b/testing/test_package_docs/fake/setAndGet.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/short.html b/testing/test_package_docs/fake/short.html
index 0b01646d2a..171e369c08 100644
--- a/testing/test_package_docs/fake/short.html
+++ b/testing/test_package_docs/fake/short.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/simpleProperty.html b/testing/test_package_docs/fake/simpleProperty.html
index 9dbbcc8a1d..d56e93019c 100644
--- a/testing/test_package_docs/fake/simpleProperty.html
+++ b/testing/test_package_docs/fake/simpleProperty.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/soIntense.html b/testing/test_package_docs/fake/soIntense.html
index cf3c5c582c..47f551034c 100644
--- a/testing/test_package_docs/fake/soIntense.html
+++ b/testing/test_package_docs/fake/soIntense.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/testingCodeSyntaxInOneLiners-constant.html b/testing/test_package_docs/fake/testingCodeSyntaxInOneLiners-constant.html
index ccc0d9d9ef..46fb48bef5 100644
--- a/testing/test_package_docs/fake/testingCodeSyntaxInOneLiners-constant.html
+++ b/testing/test_package_docs/fake/testingCodeSyntaxInOneLiners-constant.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/thisIsAlsoAsync.html b/testing/test_package_docs/fake/thisIsAlsoAsync.html
index 449597a8db..eb8a92d34d 100644
--- a/testing/test_package_docs/fake/thisIsAlsoAsync.html
+++ b/testing/test_package_docs/fake/thisIsAlsoAsync.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/thisIsAsync.html b/testing/test_package_docs/fake/thisIsAsync.html
index d060d2ee0a..6c59901487 100644
--- a/testing/test_package_docs/fake/thisIsAsync.html
+++ b/testing/test_package_docs/fake/thisIsAsync.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/thisIsFutureOr.html b/testing/test_package_docs/fake/thisIsFutureOr.html
index e629db8ee4..fca5854ad1 100644
--- a/testing/test_package_docs/fake/thisIsFutureOr.html
+++ b/testing/test_package_docs/fake/thisIsFutureOr.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/thisIsFutureOrNull.html b/testing/test_package_docs/fake/thisIsFutureOrNull.html
index 88f132eaa3..0c4e0905c0 100644
--- a/testing/test_package_docs/fake/thisIsFutureOrNull.html
+++ b/testing/test_package_docs/fake/thisIsFutureOrNull.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/thisIsFutureOrT.html b/testing/test_package_docs/fake/thisIsFutureOrT.html
index 8b444ae7da..222d02164a 100644
--- a/testing/test_package_docs/fake/thisIsFutureOrT.html
+++ b/testing/test_package_docs/fake/thisIsFutureOrT.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/topLevelFunction.html b/testing/test_package_docs/fake/topLevelFunction.html
index de1dcaaa1c..42c64109c0 100644
--- a/testing/test_package_docs/fake/topLevelFunction.html
+++ b/testing/test_package_docs/fake/topLevelFunction.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/typeParamOfFutureOr.html b/testing/test_package_docs/fake/typeParamOfFutureOr.html
index 296dc361a6..2e8d848f84 100644
--- a/testing/test_package_docs/fake/typeParamOfFutureOr.html
+++ b/testing/test_package_docs/fake/typeParamOfFutureOr.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/useSomethingInAnotherPackage.html b/testing/test_package_docs/fake/useSomethingInAnotherPackage.html
index 9100519e54..5991677eba 100644
--- a/testing/test_package_docs/fake/useSomethingInAnotherPackage.html
+++ b/testing/test_package_docs/fake/useSomethingInAnotherPackage.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/fake/useSomethingInTheSdk.html b/testing/test_package_docs/fake/useSomethingInTheSdk.html
index 73484d18e8..8eeb664346 100644
--- a/testing/test_package_docs/fake/useSomethingInTheSdk.html
+++ b/testing/test_package_docs/fake/useSomethingInTheSdk.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs/index.json b/testing/test_package_docs/index.json
index bbb3410473..df89d1934f 100644
--- a/testing/test_package_docs/index.json
+++ b/testing/test_package_docs/index.json
@@ -4044,6 +4044,28 @@
    "type": "class"
   }
  },
+ {
+  "name": "AClassUsingNewStyleMixin",
+  "qualifiedName": "fake.AClassUsingNewStyleMixin",
+  "href": "fake/AClassUsingNewStyleMixin-class.html",
+  "type": "class",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "fake",
+   "type": "library"
+  }
+ },
+ {
+  "name": "AClassUsingNewStyleMixin",
+  "qualifiedName": "fake.AClassUsingNewStyleMixin",
+  "href": "fake/AClassUsingNewStyleMixin/AClassUsingNewStyleMixin.html",
+  "type": "constructor",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "AClassUsingNewStyleMixin",
+   "type": "class"
+  }
+ },
  {
   "name": "AClassWithFancyProperties",
   "qualifiedName": "fake.AClassWithFancyProperties",
@@ -5694,6 +5716,204 @@
    "type": "class"
   }
  },
+ {
+  "name": "GenericClass",
+  "qualifiedName": "fake.GenericClass",
+  "href": "fake/GenericClass-class.html",
+  "type": "class",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "fake",
+   "type": "library"
+  }
+ },
+ {
+  "name": "GenericClass",
+  "qualifiedName": "fake.GenericClass",
+  "href": "fake/GenericClass/GenericClass.html",
+  "type": "constructor",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "GenericClass",
+   "type": "class"
+  }
+ },
+ {
+  "name": "operator ==",
+  "qualifiedName": "fake.GenericClass.==",
+  "href": "fake/GenericClass/operator_equals.html",
+  "type": "method",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "GenericClass",
+   "type": "class"
+  }
+ },
+ {
+  "name": "hashCode",
+  "qualifiedName": "fake.GenericClass.hashCode",
+  "href": "fake/GenericClass/hashCode.html",
+  "type": "property",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "GenericClass",
+   "type": "class"
+  }
+ },
+ {
+  "name": "member",
+  "qualifiedName": "fake.GenericClass.member",
+  "href": "fake/GenericClass/member.html",
+  "type": "property",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "GenericClass",
+   "type": "class"
+  }
+ },
+ {
+  "name": "noSuchMethod",
+  "qualifiedName": "fake.GenericClass.noSuchMethod",
+  "href": "fake/GenericClass/noSuchMethod.html",
+  "type": "method",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "GenericClass",
+   "type": "class"
+  }
+ },
+ {
+  "name": "overrideByBoth",
+  "qualifiedName": "fake.GenericClass.overrideByBoth",
+  "href": "fake/GenericClass/overrideByBoth.html",
+  "type": "property",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "GenericClass",
+   "type": "class"
+  }
+ },
+ {
+  "name": "overrideByEverything",
+  "qualifiedName": "fake.GenericClass.overrideByEverything",
+  "href": "fake/GenericClass/overrideByEverything.html",
+  "type": "property",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "GenericClass",
+   "type": "class"
+  }
+ },
+ {
+  "name": "overrideByGenericMixin",
+  "qualifiedName": "fake.GenericClass.overrideByGenericMixin",
+  "href": "fake/GenericClass/overrideByGenericMixin.html",
+  "type": "property",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "GenericClass",
+   "type": "class"
+  }
+ },
+ {
+  "name": "overrideByModifierClass",
+  "qualifiedName": "fake.GenericClass.overrideByModifierClass",
+  "href": "fake/GenericClass/overrideByModifierClass.html",
+  "type": "property",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "GenericClass",
+   "type": "class"
+  }
+ },
+ {
+  "name": "runtimeType",
+  "qualifiedName": "fake.GenericClass.runtimeType",
+  "href": "fake/GenericClass/runtimeType.html",
+  "type": "property",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "GenericClass",
+   "type": "class"
+  }
+ },
+ {
+  "name": "toString",
+  "qualifiedName": "fake.GenericClass.toString",
+  "href": "fake/GenericClass/toString.html",
+  "type": "method",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "GenericClass",
+   "type": "class"
+  }
+ },
+ {
+  "name": "GenericMixin",
+  "qualifiedName": "fake.GenericMixin",
+  "href": "fake/GenericMixin/GenericMixin.html",
+  "type": "constructor",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "GenericMixin",
+   "type": "mixin"
+  }
+ },
+ {
+  "name": "GenericMixin",
+  "qualifiedName": "fake.GenericMixin",
+  "href": "fake/GenericMixin-mixin.html",
+  "type": "mixin",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "fake",
+   "type": "library"
+  }
+ },
+ {
+  "name": "mixinMember",
+  "qualifiedName": "fake.GenericMixin.mixinMember",
+  "href": "fake/GenericMixin/mixinMember.html",
+  "type": "property",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "GenericMixin",
+   "type": "mixin"
+  }
+ },
+ {
+  "name": "overrideByBoth",
+  "qualifiedName": "fake.GenericMixin.overrideByBoth",
+  "href": "fake/GenericMixin/overrideByBoth.html",
+  "type": "property",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "GenericMixin",
+   "type": "mixin"
+  }
+ },
+ {
+  "name": "overrideByEverything",
+  "qualifiedName": "fake.GenericMixin.overrideByEverything",
+  "href": "fake/GenericMixin/overrideByEverything.html",
+  "type": "property",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "GenericMixin",
+   "type": "mixin"
+  }
+ },
+ {
+  "name": "overrideByGenericMixin",
+  "qualifiedName": "fake.GenericMixin.overrideByGenericMixin",
+  "href": "fake/GenericMixin/overrideByGenericMixin.html",
+  "type": "property",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "GenericMixin",
+   "type": "mixin"
+  }
+ },
  {
   "name": "GenericTypedef",
   "qualifiedName": "fake.GenericTypedef",
@@ -7025,6 +7245,72 @@
    "type": "class"
   }
  },
+ {
+  "name": "ModifierClass",
+  "qualifiedName": "fake.ModifierClass",
+  "href": "fake/ModifierClass-class.html",
+  "type": "class",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "fake",
+   "type": "library"
+  }
+ },
+ {
+  "name": "ModifierClass",
+  "qualifiedName": "fake.ModifierClass",
+  "href": "fake/ModifierClass/ModifierClass.html",
+  "type": "constructor",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "ModifierClass",
+   "type": "class"
+  }
+ },
+ {
+  "name": "modifierMember",
+  "qualifiedName": "fake.ModifierClass.modifierMember",
+  "href": "fake/ModifierClass/modifierMember.html",
+  "type": "property",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "ModifierClass",
+   "type": "class"
+  }
+ },
+ {
+  "name": "overrideByBoth",
+  "qualifiedName": "fake.ModifierClass.overrideByBoth",
+  "href": "fake/ModifierClass/overrideByBoth.html",
+  "type": "property",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "ModifierClass",
+   "type": "class"
+  }
+ },
+ {
+  "name": "overrideByEverything",
+  "qualifiedName": "fake.ModifierClass.overrideByEverything",
+  "href": "fake/ModifierClass/overrideByEverything.html",
+  "type": "property",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "ModifierClass",
+   "type": "class"
+  }
+ },
+ {
+  "name": "overrideByModifierClass",
+  "qualifiedName": "fake.ModifierClass.overrideByModifierClass",
+  "href": "fake/ModifierClass/overrideByModifierClass.html",
+  "type": "property",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "ModifierClass",
+   "type": "class"
+  }
+ },
  {
   "name": "NAME_SINGLEUNDERSCORE",
   "qualifiedName": "fake.NAME_SINGLEUNDERSCORE",
@@ -7058,6 +7344,39 @@
    "type": "library"
   }
  },
+ {
+  "name": "NewStyleMixinCallingSuper",
+  "qualifiedName": "fake.NewStyleMixinCallingSuper",
+  "href": "fake/NewStyleMixinCallingSuper/NewStyleMixinCallingSuper.html",
+  "type": "constructor",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "NewStyleMixinCallingSuper",
+   "type": "mixin"
+  }
+ },
+ {
+  "name": "NewStyleMixinCallingSuper",
+  "qualifiedName": "fake.NewStyleMixinCallingSuper",
+  "href": "fake/NewStyleMixinCallingSuper-mixin.html",
+  "type": "mixin",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "fake",
+   "type": "library"
+  }
+ },
+ {
+  "name": "superString",
+  "qualifiedName": "fake.NewStyleMixinCallingSuper.superString",
+  "href": "fake/NewStyleMixinCallingSuper/superString.html",
+  "type": "property",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "NewStyleMixinCallingSuper",
+   "type": "mixin"
+  }
+ },
  {
   "name": "NotAMixin",
   "qualifiedName": "fake.NotAMixin",
@@ -8356,6 +8675,39 @@
    "type": "class"
   }
  },
+ {
+  "name": "TypeInferenceMixedIn",
+  "qualifiedName": "fake.TypeInferenceMixedIn",
+  "href": "fake/TypeInferenceMixedIn-class.html",
+  "type": "class",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "fake",
+   "type": "library"
+  }
+ },
+ {
+  "name": "TypeInferenceMixedIn",
+  "qualifiedName": "fake.TypeInferenceMixedIn",
+  "href": "fake/TypeInferenceMixedIn/TypeInferenceMixedIn.html",
+  "type": "constructor",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "TypeInferenceMixedIn",
+   "type": "class"
+  }
+ },
+ {
+  "name": "overrideByEverything",
+  "qualifiedName": "fake.TypeInferenceMixedIn.overrideByEverything",
+  "href": "fake/TypeInferenceMixedIn/overrideByEverything.html",
+  "type": "property",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "TypeInferenceMixedIn",
+   "type": "class"
+  }
+ },
  {
   "name": "TypedefUsingClass",
   "qualifiedName": "fake.TypedefUsingClass",
diff --git a/testing/test_package_docs/is_deprecated/is_deprecated-library.html b/testing/test_package_docs/is_deprecated/is_deprecated-library.html
index 4cac1680f9..837854db58 100644
--- a/testing/test_package_docs/is_deprecated/is_deprecated-library.html
+++ b/testing/test_package_docs/is_deprecated/is_deprecated-library.html
@@ -76,6 +76,7 @@ <h1>is_deprecated library </h1>
 
 
 
+
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
@@ -87,6 +88,7 @@ <h5>is_deprecated library</h5>
     
     
     
+    
     </ol>
   </div><!--/sidebar-offcanvas-right-->
 
diff --git a/testing/test_package_docs/reexport_one/SomeOtherClass-class.html b/testing/test_package_docs/reexport_one/SomeOtherClass-class.html
index 6974015a20..e715879943 100644
--- a/testing/test_package_docs/reexport_one/SomeOtherClass-class.html
+++ b/testing/test_package_docs/reexport_one/SomeOtherClass-class.html
@@ -49,6 +49,7 @@ <h5>reexport_one library</h5>
     
     
     
+    
     </ol>
   </div>
 
diff --git a/testing/test_package_docs/reexport_one/reexport_one-library.html b/testing/test_package_docs/reexport_one/reexport_one-library.html
index f21f42c9c5..aa8a8c98ef 100644
--- a/testing/test_package_docs/reexport_one/reexport_one-library.html
+++ b/testing/test_package_docs/reexport_one/reexport_one-library.html
@@ -107,6 +107,7 @@ <h2>Classes</h2>
 
 
 
+
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
@@ -123,6 +124,7 @@ <h5>reexport_one library</h5>
     
     
     
+    
     </ol>
   </div><!--/sidebar-offcanvas-right-->
 
diff --git a/testing/test_package_docs/reexport_two/AUnicornClass-class.html b/testing/test_package_docs/reexport_two/AUnicornClass-class.html
index 5b7a42df18..c773478936 100644
--- a/testing/test_package_docs/reexport_two/AUnicornClass-class.html
+++ b/testing/test_package_docs/reexport_two/AUnicornClass-class.html
@@ -49,6 +49,7 @@ <h5>reexport_two library</h5>
     
     
     
+    
     </ol>
   </div>
 
diff --git a/testing/test_package_docs/reexport_two/SomeClass-class.html b/testing/test_package_docs/reexport_two/SomeClass-class.html
index 2cff883f72..027dee4024 100644
--- a/testing/test_package_docs/reexport_two/SomeClass-class.html
+++ b/testing/test_package_docs/reexport_two/SomeClass-class.html
@@ -49,6 +49,7 @@ <h5>reexport_two library</h5>
     
     
     
+    
     </ol>
   </div>
 
diff --git a/testing/test_package_docs/reexport_two/YetAnotherClass-class.html b/testing/test_package_docs/reexport_two/YetAnotherClass-class.html
index e9153f403c..8b6ce764d1 100644
--- a/testing/test_package_docs/reexport_two/YetAnotherClass-class.html
+++ b/testing/test_package_docs/reexport_two/YetAnotherClass-class.html
@@ -49,6 +49,7 @@ <h5>reexport_two library</h5>
     
     
     
+    
     </ol>
   </div>
 
diff --git a/testing/test_package_docs/reexport_two/reexport_two-library.html b/testing/test_package_docs/reexport_two/reexport_two-library.html
index e09900e665..73dfe7ef7a 100644
--- a/testing/test_package_docs/reexport_two/reexport_two-library.html
+++ b/testing/test_package_docs/reexport_two/reexport_two-library.html
@@ -107,6 +107,7 @@ <h2>Classes</h2>
 
 
 
+
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
@@ -123,6 +124,7 @@ <h5>reexport_two library</h5>
     
     
     
+    
     </ol>
   </div><!--/sidebar-offcanvas-right-->
 
diff --git a/testing/test_package_docs/test_package_imported.main/Whataclass-class.html b/testing/test_package_docs/test_package_imported.main/Whataclass-class.html
index 4d073ac567..f1e625f477 100644
--- a/testing/test_package_docs/test_package_imported.main/Whataclass-class.html
+++ b/testing/test_package_docs/test_package_imported.main/Whataclass-class.html
@@ -47,6 +47,7 @@ <h5>test_package_imported.main library</h5>
     
     
     
+    
     </ol>
   </div>
 
diff --git a/testing/test_package_docs/test_package_imported.main/Whataclass2-class.html b/testing/test_package_docs/test_package_imported.main/Whataclass2-class.html
index 0732e6e6c8..05306a1437 100644
--- a/testing/test_package_docs/test_package_imported.main/Whataclass2-class.html
+++ b/testing/test_package_docs/test_package_imported.main/Whataclass2-class.html
@@ -47,6 +47,7 @@ <h5>test_package_imported.main library</h5>
     
     
     
+    
     </ol>
   </div>
 
diff --git a/testing/test_package_docs/test_package_imported.main/test_package_imported.main-library.html b/testing/test_package_docs/test_package_imported.main/test_package_imported.main-library.html
index b402f96406..c73d180d6a 100644
--- a/testing/test_package_docs/test_package_imported.main/test_package_imported.main-library.html
+++ b/testing/test_package_docs/test_package_imported.main/test_package_imported.main-library.html
@@ -91,6 +91,7 @@ <h2>Classes</h2>
 
 
 
+
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
@@ -105,6 +106,7 @@ <h5>test_package_imported.main library</h5>
     
     
     
+    
     </ol>
   </div><!--/sidebar-offcanvas-right-->
 
diff --git a/testing/test_package_docs/topics/Superb-topic.html b/testing/test_package_docs/topics/Superb-topic.html
index c7288229da..f48e5bf66d 100644
--- a/testing/test_package_docs/topics/Superb-topic.html
+++ b/testing/test_package_docs/topics/Superb-topic.html
@@ -91,11 +91,13 @@ <h2>Classes</h2>
 
 
 
+
   </div> <!-- /.main-content -->
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
     <h5>Superb Topic</h5>
     <ol>
     
+    
       <li class="section-title"><a href="topics/Superb-topic.html#classes">Classes</a></li>
       <li><a href="fake/BaseForDocComments-class.html">BaseForDocComments</a></li>
     
diff --git a/testing/test_package_docs/topics/Unreal-topic.html b/testing/test_package_docs/topics/Unreal-topic.html
index fc33f2f3d3..52fc7cf02b 100644
--- a/testing/test_package_docs/topics/Unreal-topic.html
+++ b/testing/test_package_docs/topics/Unreal-topic.html
@@ -110,6 +110,7 @@ <h2>Classes</h2>
 
 
 
+
   </div> <!-- /.main-content -->
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
     <h5>Unreal Topic</h5>
@@ -118,6 +119,7 @@ <h5>Unreal Topic</h5>
       <li><a href="reexport_one/reexport_one-library.html">reexport_one</a></li>
       <li><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
     
+    
       <li class="section-title"><a href="topics/Unreal-topic.html#classes">Classes</a></li>
       <li><a href="fake/BaseForDocComments-class.html">BaseForDocComments</a></li>
     
diff --git a/testing/test_package_docs/two_exports/BaseClass-class.html b/testing/test_package_docs/two_exports/BaseClass-class.html
index 5c662180e7..e7878f8489 100644
--- a/testing/test_package_docs/two_exports/BaseClass-class.html
+++ b/testing/test_package_docs/two_exports/BaseClass-class.html
@@ -43,6 +43,7 @@ <h5>two_exports library</h5>
       <li><a href="two_exports/ExtendingClass-class.html">ExtendingClass</a></li>
     
     
+    
       <li class="section-title"><a href="two_exports/two_exports-library.html#properties">Properties</a></li>
       <li><a href="two_exports/topLevelVariable.html">topLevelVariable</a></li>
     
diff --git a/testing/test_package_docs/two_exports/ExtendingClass-class.html b/testing/test_package_docs/two_exports/ExtendingClass-class.html
index eeebb58c53..7bf40b2e1a 100644
--- a/testing/test_package_docs/two_exports/ExtendingClass-class.html
+++ b/testing/test_package_docs/two_exports/ExtendingClass-class.html
@@ -43,6 +43,7 @@ <h5>two_exports library</h5>
       <li><a href="two_exports/ExtendingClass-class.html">ExtendingClass</a></li>
     
     
+    
       <li class="section-title"><a href="two_exports/two_exports-library.html#properties">Properties</a></li>
       <li><a href="two_exports/topLevelVariable.html">topLevelVariable</a></li>
     
diff --git a/testing/test_package_docs/two_exports/topLevelVariable.html b/testing/test_package_docs/two_exports/topLevelVariable.html
index 2286b5481e..220c4ad814 100644
--- a/testing/test_package_docs/two_exports/topLevelVariable.html
+++ b/testing/test_package_docs/two_exports/topLevelVariable.html
@@ -43,6 +43,7 @@ <h5>two_exports library</h5>
       <li><a href="two_exports/ExtendingClass-class.html">ExtendingClass</a></li>
     
     
+    
       <li class="section-title"><a href="two_exports/two_exports-library.html#properties">Properties</a></li>
       <li><a href="two_exports/topLevelVariable.html">topLevelVariable</a></li>
     
diff --git a/testing/test_package_docs/two_exports/two_exports-library.html b/testing/test_package_docs/two_exports/two_exports-library.html
index 42083e07bb..37b012ac29 100644
--- a/testing/test_package_docs/two_exports/two_exports-library.html
+++ b/testing/test_package_docs/two_exports/two_exports-library.html
@@ -86,6 +86,7 @@ <h2>Classes</h2>
     </section>
 
 
+
     <section class="summary offset-anchor" id="properties">
       <h2>Properties</h2>
 
@@ -115,6 +116,7 @@ <h5>two_exports library</h5>
       <li><a href="two_exports/ExtendingClass-class.html">ExtendingClass</a></li>
     
     
+    
       <li class="section-title"><a href="two_exports/two_exports-library.html#properties">Properties</a></li>
       <li><a href="two_exports/topLevelVariable.html">topLevelVariable</a></li>
     
diff --git a/testing/test_package_docs_dev/anonymous_library/anonymous_library-library.html b/testing/test_package_docs_dev/anonymous_library/anonymous_library-library.html
index 2f0d6ef67d..35e58fd823 100644
--- a/testing/test_package_docs_dev/anonymous_library/anonymous_library-library.html
+++ b/testing/test_package_docs_dev/anonymous_library/anonymous_library-library.html
@@ -69,6 +69,7 @@ <h1>anonymous_library library </h1>
 
 
 
+
     <section class="summary offset-anchor" id="functions">
       <h2>Functions</h2>
 
@@ -96,6 +97,7 @@ <h5>anonymous_library library</h5>
     
     
     
+    
       <li class="section-title"><a href="anonymous_library/anonymous_library-library.html#functions">Functions</a></li>
       <li><a href="anonymous_library/doesStuff.html">doesStuff</a></li>
     
diff --git a/testing/test_package_docs_dev/anonymous_library/doesStuff.html b/testing/test_package_docs_dev/anonymous_library/doesStuff.html
index 1a498697cb..87b6392d97 100644
--- a/testing/test_package_docs_dev/anonymous_library/doesStuff.html
+++ b/testing/test_package_docs_dev/anonymous_library/doesStuff.html
@@ -41,6 +41,7 @@ <h5>anonymous_library library</h5>
     
     
     
+    
       <li class="section-title"><a href="anonymous_library/anonymous_library-library.html#functions">Functions</a></li>
       <li><a href="anonymous_library/doesStuff.html">doesStuff</a></li>
     
diff --git a/testing/test_package_docs_dev/another_anonymous_lib/another_anonymous_lib-library.html b/testing/test_package_docs_dev/another_anonymous_lib/another_anonymous_lib-library.html
index 615dc5679e..8dc9c1a11e 100644
--- a/testing/test_package_docs_dev/another_anonymous_lib/another_anonymous_lib-library.html
+++ b/testing/test_package_docs_dev/another_anonymous_lib/another_anonymous_lib-library.html
@@ -69,6 +69,7 @@ <h1>another_anonymous_lib library </h1>
 
 
 
+
     <section class="summary offset-anchor" id="functions">
       <h2>Functions</h2>
 
@@ -96,6 +97,7 @@ <h5>another_anonymous_lib library</h5>
     
     
     
+    
       <li class="section-title"><a href="another_anonymous_lib/another_anonymous_lib-library.html#functions">Functions</a></li>
       <li><a href="another_anonymous_lib/greeting.html">greeting</a></li>
     
diff --git a/testing/test_package_docs_dev/another_anonymous_lib/greeting.html b/testing/test_package_docs_dev/another_anonymous_lib/greeting.html
index c07f32a6fd..3e7dcfa215 100644
--- a/testing/test_package_docs_dev/another_anonymous_lib/greeting.html
+++ b/testing/test_package_docs_dev/another_anonymous_lib/greeting.html
@@ -41,6 +41,7 @@ <h5>another_anonymous_lib library</h5>
     
     
     
+    
       <li class="section-title"><a href="another_anonymous_lib/another_anonymous_lib-library.html#functions">Functions</a></li>
       <li><a href="another_anonymous_lib/greeting.html">greeting</a></li>
     
diff --git a/testing/test_package_docs_dev/categoriesExported/IAmAClassWithCategories-class.html b/testing/test_package_docs_dev/categoriesExported/IAmAClassWithCategories-class.html
index eec9c6368a..ee9afac76a 100644
--- a/testing/test_package_docs_dev/categoriesExported/IAmAClassWithCategories-class.html
+++ b/testing/test_package_docs_dev/categoriesExported/IAmAClassWithCategories-class.html
@@ -46,6 +46,7 @@ <h5>categoriesExported library</h5>
     
     
     
+    
     </ol>
   </div>
 
diff --git a/testing/test_package_docs_dev/categoriesExported/categoriesExported-library.html b/testing/test_package_docs_dev/categoriesExported/categoriesExported-library.html
index 13bf0bb7dd..bf955d52ad 100644
--- a/testing/test_package_docs_dev/categoriesExported/categoriesExported-library.html
+++ b/testing/test_package_docs_dev/categoriesExported/categoriesExported-library.html
@@ -85,6 +85,7 @@ <h2>Classes</h2>
 
 
 
+
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
@@ -98,6 +99,7 @@ <h5>categoriesExported library</h5>
     
     
     
+    
     </ol>
   </div><!--/sidebar-offcanvas-right-->
 
diff --git a/testing/test_package_docs_dev/code_in_comments/code_in_comments-library.html b/testing/test_package_docs_dev/code_in_comments/code_in_comments-library.html
index 2cef34da6d..f777dec8b2 100644
--- a/testing/test_package_docs_dev/code_in_comments/code_in_comments-library.html
+++ b/testing/test_package_docs_dev/code_in_comments/code_in_comments-library.html
@@ -84,6 +84,7 @@ <h1>code_in_comments library </h1>
 
 
 
+
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
@@ -95,6 +96,7 @@ <h5>code_in_comments library</h5>
     
     
     
+    
     </ol>
   </div><!--/sidebar-offcanvas-right-->
 
diff --git a/testing/test_package_docs_dev/css/css-library.html b/testing/test_package_docs_dev/css/css-library.html
index 76ee0edb73..c4e97713c7 100644
--- a/testing/test_package_docs_dev/css/css-library.html
+++ b/testing/test_package_docs_dev/css/css-library.html
@@ -72,6 +72,7 @@ <h1>css library </h1>
     
 
 
+
     <section class="summary offset-anchor" id="properties">
       <h2>Properties</h2>
 
@@ -98,6 +99,7 @@ <h5>css library</h5>
     <ol>
     
     
+    
       <li class="section-title"><a href="css/css-library.html#properties">Properties</a></li>
       <li><a href="css/theOnlyThingInTheLibrary.html">theOnlyThingInTheLibrary</a></li>
     
diff --git a/testing/test_package_docs_dev/css/theOnlyThingInTheLibrary.html b/testing/test_package_docs_dev/css/theOnlyThingInTheLibrary.html
index 7671e69e71..489cf57eeb 100644
--- a/testing/test_package_docs_dev/css/theOnlyThingInTheLibrary.html
+++ b/testing/test_package_docs_dev/css/theOnlyThingInTheLibrary.html
@@ -40,6 +40,7 @@ <h5>css library</h5>
     <ol>
     
     
+    
       <li class="section-title"><a href="css/css-library.html#properties">Properties</a></li>
       <li><a href="css/theOnlyThingInTheLibrary.html">theOnlyThingInTheLibrary</a></li>
     
diff --git a/testing/test_package_docs_dev/ex/Animal-class.html b/testing/test_package_docs_dev/ex/Animal-class.html
index dc9cf04644..2c4dc04b07 100644
--- a/testing/test_package_docs_dev/ex/Animal-class.html
+++ b/testing/test_package_docs_dev/ex/Animal-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs_dev/ex/AnotherParameterizedClass-class.html b/testing/test_package_docs_dev/ex/AnotherParameterizedClass-class.html
index 9c1a63b10a..656df835bd 100644
--- a/testing/test_package_docs_dev/ex/AnotherParameterizedClass-class.html
+++ b/testing/test_package_docs_dev/ex/AnotherParameterizedClass-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs_dev/ex/Apple-class.html b/testing/test_package_docs_dev/ex/Apple-class.html
index e7f44b103c..986e6a52a3 100644
--- a/testing/test_package_docs_dev/ex/Apple-class.html
+++ b/testing/test_package_docs_dev/ex/Apple-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs_dev/ex/B-class.html b/testing/test_package_docs_dev/ex/B-class.html
index 3c9cbb1e52..61660e735a 100644
--- a/testing/test_package_docs_dev/ex/B-class.html
+++ b/testing/test_package_docs_dev/ex/B-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs_dev/ex/COLOR-constant.html b/testing/test_package_docs_dev/ex/COLOR-constant.html
index 8ed51eb106..27949bcffc 100644
--- a/testing/test_package_docs_dev/ex/COLOR-constant.html
+++ b/testing/test_package_docs_dev/ex/COLOR-constant.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs_dev/ex/COLOR_GREEN-constant.html b/testing/test_package_docs_dev/ex/COLOR_GREEN-constant.html
index acfdb113d7..f539a49ff5 100644
--- a/testing/test_package_docs_dev/ex/COLOR_GREEN-constant.html
+++ b/testing/test_package_docs_dev/ex/COLOR_GREEN-constant.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs_dev/ex/COLOR_ORANGE-constant.html b/testing/test_package_docs_dev/ex/COLOR_ORANGE-constant.html
index 729e501fcb..c6359e916d 100644
--- a/testing/test_package_docs_dev/ex/COLOR_ORANGE-constant.html
+++ b/testing/test_package_docs_dev/ex/COLOR_ORANGE-constant.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs_dev/ex/COMPLEX_COLOR-constant.html b/testing/test_package_docs_dev/ex/COMPLEX_COLOR-constant.html
index a3cc88b8dc..3dde0f7ce7 100644
--- a/testing/test_package_docs_dev/ex/COMPLEX_COLOR-constant.html
+++ b/testing/test_package_docs_dev/ex/COMPLEX_COLOR-constant.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs_dev/ex/Cat-class.html b/testing/test_package_docs_dev/ex/Cat-class.html
index c189b22c4e..c089c7c7c1 100644
--- a/testing/test_package_docs_dev/ex/Cat-class.html
+++ b/testing/test_package_docs_dev/ex/Cat-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs_dev/ex/CatString-class.html b/testing/test_package_docs_dev/ex/CatString-class.html
index 2f3d6407f9..c44a0039c3 100644
--- a/testing/test_package_docs_dev/ex/CatString-class.html
+++ b/testing/test_package_docs_dev/ex/CatString-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs_dev/ex/ConstantCat-class.html b/testing/test_package_docs_dev/ex/ConstantCat-class.html
index 4ca62f3a46..2f821b1b29 100644
--- a/testing/test_package_docs_dev/ex/ConstantCat-class.html
+++ b/testing/test_package_docs_dev/ex/ConstantCat-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs_dev/ex/Deprecated-class.html b/testing/test_package_docs_dev/ex/Deprecated-class.html
index 6a14f348d8..c84d00d9d3 100644
--- a/testing/test_package_docs_dev/ex/Deprecated-class.html
+++ b/testing/test_package_docs_dev/ex/Deprecated-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs_dev/ex/Dog-class.html b/testing/test_package_docs_dev/ex/Dog-class.html
index 022fe0e5fc..b8ec81eaf2 100644
--- a/testing/test_package_docs_dev/ex/Dog-class.html
+++ b/testing/test_package_docs_dev/ex/Dog-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs_dev/ex/E-class.html b/testing/test_package_docs_dev/ex/E-class.html
index f8ae03f864..b5d93a53f9 100644
--- a/testing/test_package_docs_dev/ex/E-class.html
+++ b/testing/test_package_docs_dev/ex/E-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs_dev/ex/ExtendedShortName-class.html b/testing/test_package_docs_dev/ex/ExtendedShortName-class.html
index 0c5ce21f9b..919df7ffca 100644
--- a/testing/test_package_docs_dev/ex/ExtendedShortName-class.html
+++ b/testing/test_package_docs_dev/ex/ExtendedShortName-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs_dev/ex/F-class.html b/testing/test_package_docs_dev/ex/F-class.html
index 8275c5b6cf..01271dc563 100644
--- a/testing/test_package_docs_dev/ex/F-class.html
+++ b/testing/test_package_docs_dev/ex/F-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs_dev/ex/ForAnnotation-class.html b/testing/test_package_docs_dev/ex/ForAnnotation-class.html
index a60516bc13..b28a3918aa 100644
--- a/testing/test_package_docs_dev/ex/ForAnnotation-class.html
+++ b/testing/test_package_docs_dev/ex/ForAnnotation-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs_dev/ex/HasAnnotation-class.html b/testing/test_package_docs_dev/ex/HasAnnotation-class.html
index 75b7a4a60e..a5c47e148e 100644
--- a/testing/test_package_docs_dev/ex/HasAnnotation-class.html
+++ b/testing/test_package_docs_dev/ex/HasAnnotation-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs_dev/ex/Helper-class.html b/testing/test_package_docs_dev/ex/Helper-class.html
index f1241bed91..ce414955cb 100644
--- a/testing/test_package_docs_dev/ex/Helper-class.html
+++ b/testing/test_package_docs_dev/ex/Helper-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs_dev/ex/Klass-class.html b/testing/test_package_docs_dev/ex/Klass-class.html
index a72060a8fa..db46c06f4e 100644
--- a/testing/test_package_docs_dev/ex/Klass-class.html
+++ b/testing/test_package_docs_dev/ex/Klass-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs_dev/ex/MY_CAT-constant.html b/testing/test_package_docs_dev/ex/MY_CAT-constant.html
index 1ee43d0528..db7eaf6c82 100644
--- a/testing/test_package_docs_dev/ex/MY_CAT-constant.html
+++ b/testing/test_package_docs_dev/ex/MY_CAT-constant.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs_dev/ex/MyError-class.html b/testing/test_package_docs_dev/ex/MyError-class.html
index dc50226021..d0307a1f2b 100644
--- a/testing/test_package_docs_dev/ex/MyError-class.html
+++ b/testing/test_package_docs_dev/ex/MyError-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs_dev/ex/MyErrorImplements-class.html b/testing/test_package_docs_dev/ex/MyErrorImplements-class.html
index bc4c4541d5..a7a3a70ee2 100644
--- a/testing/test_package_docs_dev/ex/MyErrorImplements-class.html
+++ b/testing/test_package_docs_dev/ex/MyErrorImplements-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs_dev/ex/MyException-class.html b/testing/test_package_docs_dev/ex/MyException-class.html
index 71fd791e9f..7dc43df66b 100644
--- a/testing/test_package_docs_dev/ex/MyException-class.html
+++ b/testing/test_package_docs_dev/ex/MyException-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs_dev/ex/MyExceptionImplements-class.html b/testing/test_package_docs_dev/ex/MyExceptionImplements-class.html
index 1689825cac..08d4627268 100644
--- a/testing/test_package_docs_dev/ex/MyExceptionImplements-class.html
+++ b/testing/test_package_docs_dev/ex/MyExceptionImplements-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs_dev/ex/PRETTY_COLORS-constant.html b/testing/test_package_docs_dev/ex/PRETTY_COLORS-constant.html
index 7b171ff690..4dfcf59fe1 100644
--- a/testing/test_package_docs_dev/ex/PRETTY_COLORS-constant.html
+++ b/testing/test_package_docs_dev/ex/PRETTY_COLORS-constant.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs_dev/ex/ParameterizedClass-class.html b/testing/test_package_docs_dev/ex/ParameterizedClass-class.html
index 5e7bc1a630..c3f26d7c69 100644
--- a/testing/test_package_docs_dev/ex/ParameterizedClass-class.html
+++ b/testing/test_package_docs_dev/ex/ParameterizedClass-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs_dev/ex/ParameterizedTypedef.html b/testing/test_package_docs_dev/ex/ParameterizedTypedef.html
index bf2978d5b1..eb825cb388 100644
--- a/testing/test_package_docs_dev/ex/ParameterizedTypedef.html
+++ b/testing/test_package_docs_dev/ex/ParameterizedTypedef.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs_dev/ex/PublicClassExtendsPrivateClass-class.html b/testing/test_package_docs_dev/ex/PublicClassExtendsPrivateClass-class.html
index 36b55c8f56..f82240fa97 100644
--- a/testing/test_package_docs_dev/ex/PublicClassExtendsPrivateClass-class.html
+++ b/testing/test_package_docs_dev/ex/PublicClassExtendsPrivateClass-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs_dev/ex/PublicClassImplementsPrivateInterface-class.html b/testing/test_package_docs_dev/ex/PublicClassImplementsPrivateInterface-class.html
index 4b8a5ab3fa..83fa869062 100644
--- a/testing/test_package_docs_dev/ex/PublicClassImplementsPrivateInterface-class.html
+++ b/testing/test_package_docs_dev/ex/PublicClassImplementsPrivateInterface-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs_dev/ex/ShapeType-class.html b/testing/test_package_docs_dev/ex/ShapeType-class.html
index cdca4bf0ec..b2e8f497c1 100644
--- a/testing/test_package_docs_dev/ex/ShapeType-class.html
+++ b/testing/test_package_docs_dev/ex/ShapeType-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs_dev/ex/ShortName-class.html b/testing/test_package_docs_dev/ex/ShortName-class.html
index 45b8af833b..6978f1e366 100644
--- a/testing/test_package_docs_dev/ex/ShortName-class.html
+++ b/testing/test_package_docs_dev/ex/ShortName-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs_dev/ex/SpecializedDuration-class.html b/testing/test_package_docs_dev/ex/SpecializedDuration-class.html
index c8e5fc7727..22a9b2d1e4 100644
--- a/testing/test_package_docs_dev/ex/SpecializedDuration-class.html
+++ b/testing/test_package_docs_dev/ex/SpecializedDuration-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs_dev/ex/TemplatedClass-class.html b/testing/test_package_docs_dev/ex/TemplatedClass-class.html
index edceac636b..48284dc0d1 100644
--- a/testing/test_package_docs_dev/ex/TemplatedClass-class.html
+++ b/testing/test_package_docs_dev/ex/TemplatedClass-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs_dev/ex/TemplatedInterface-class.html b/testing/test_package_docs_dev/ex/TemplatedInterface-class.html
index ee27965c2f..2430992701 100644
--- a/testing/test_package_docs_dev/ex/TemplatedInterface-class.html
+++ b/testing/test_package_docs_dev/ex/TemplatedInterface-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs_dev/ex/ToolUser-class.html b/testing/test_package_docs_dev/ex/ToolUser-class.html
index 316b655ec4..b4faff0150 100644
--- a/testing/test_package_docs_dev/ex/ToolUser-class.html
+++ b/testing/test_package_docs_dev/ex/ToolUser-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs_dev/ex/TypedFunctionsWithoutTypedefs-class.html b/testing/test_package_docs_dev/ex/TypedFunctionsWithoutTypedefs-class.html
index bb7f483738..e640b32ab8 100644
--- a/testing/test_package_docs_dev/ex/TypedFunctionsWithoutTypedefs-class.html
+++ b/testing/test_package_docs_dev/ex/TypedFunctionsWithoutTypedefs-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs_dev/ex/WithGeneric-class.html b/testing/test_package_docs_dev/ex/WithGeneric-class.html
index 77f3e06b0d..13e7b2dcba 100644
--- a/testing/test_package_docs_dev/ex/WithGeneric-class.html
+++ b/testing/test_package_docs_dev/ex/WithGeneric-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs_dev/ex/WithGenericSub-class.html b/testing/test_package_docs_dev/ex/WithGenericSub-class.html
index 5b2833452b..9fa67f6707 100644
--- a/testing/test_package_docs_dev/ex/WithGenericSub-class.html
+++ b/testing/test_package_docs_dev/ex/WithGenericSub-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs_dev/ex/aComplexTypedef.html b/testing/test_package_docs_dev/ex/aComplexTypedef.html
index 7a92b5f98d..57bdb5b9f5 100644
--- a/testing/test_package_docs_dev/ex/aComplexTypedef.html
+++ b/testing/test_package_docs_dev/ex/aComplexTypedef.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs_dev/ex/aThingToDo-class.html b/testing/test_package_docs_dev/ex/aThingToDo-class.html
index c17ddd2fcf..fe926de03c 100644
--- a/testing/test_package_docs_dev/ex/aThingToDo-class.html
+++ b/testing/test_package_docs_dev/ex/aThingToDo-class.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs_dev/ex/deprecated-constant.html b/testing/test_package_docs_dev/ex/deprecated-constant.html
index 318362f29a..02b5612819 100644
--- a/testing/test_package_docs_dev/ex/deprecated-constant.html
+++ b/testing/test_package_docs_dev/ex/deprecated-constant.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs_dev/ex/deprecatedField.html b/testing/test_package_docs_dev/ex/deprecatedField.html
index 166c84538c..475d074af5 100644
--- a/testing/test_package_docs_dev/ex/deprecatedField.html
+++ b/testing/test_package_docs_dev/ex/deprecatedField.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs_dev/ex/deprecatedGetter.html b/testing/test_package_docs_dev/ex/deprecatedGetter.html
index e0541a2836..69d1e56de1 100644
--- a/testing/test_package_docs_dev/ex/deprecatedGetter.html
+++ b/testing/test_package_docs_dev/ex/deprecatedGetter.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs_dev/ex/deprecatedSetter.html b/testing/test_package_docs_dev/ex/deprecatedSetter.html
index ef6cbd3b26..253a465018 100644
--- a/testing/test_package_docs_dev/ex/deprecatedSetter.html
+++ b/testing/test_package_docs_dev/ex/deprecatedSetter.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs_dev/ex/ex-library.html b/testing/test_package_docs_dev/ex/ex-library.html
index 8729ae3c01..2b118d20ca 100644
--- a/testing/test_package_docs_dev/ex/ex-library.html
+++ b/testing/test_package_docs_dev/ex/ex-library.html
@@ -253,6 +253,7 @@ <h2>Classes</h2>
       </dl>
     </section>
 
+
     <section class="summary offset-anchor" id="constants">
       <h2>Constants</h2>
 
@@ -546,6 +547,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs_dev/ex/function1.html b/testing/test_package_docs_dev/ex/function1.html
index a64b0530fc..67b7985441 100644
--- a/testing/test_package_docs_dev/ex/function1.html
+++ b/testing/test_package_docs_dev/ex/function1.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs_dev/ex/genericFunction.html b/testing/test_package_docs_dev/ex/genericFunction.html
index 893e3bf046..f3818c57fb 100644
--- a/testing/test_package_docs_dev/ex/genericFunction.html
+++ b/testing/test_package_docs_dev/ex/genericFunction.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs_dev/ex/incorrectDocReference-constant.html b/testing/test_package_docs_dev/ex/incorrectDocReference-constant.html
index 6630af044f..2dba274bc6 100644
--- a/testing/test_package_docs_dev/ex/incorrectDocReference-constant.html
+++ b/testing/test_package_docs_dev/ex/incorrectDocReference-constant.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs_dev/ex/incorrectDocReferenceFromEx-constant.html b/testing/test_package_docs_dev/ex/incorrectDocReferenceFromEx-constant.html
index d3971cf72d..81ef5d3ba2 100644
--- a/testing/test_package_docs_dev/ex/incorrectDocReferenceFromEx-constant.html
+++ b/testing/test_package_docs_dev/ex/incorrectDocReferenceFromEx-constant.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs_dev/ex/number.html b/testing/test_package_docs_dev/ex/number.html
index f6ffd36f83..865e95199e 100644
--- a/testing/test_package_docs_dev/ex/number.html
+++ b/testing/test_package_docs_dev/ex/number.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs_dev/ex/processMessage.html b/testing/test_package_docs_dev/ex/processMessage.html
index 95cc9644a8..8967e056e6 100644
--- a/testing/test_package_docs_dev/ex/processMessage.html
+++ b/testing/test_package_docs_dev/ex/processMessage.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs_dev/ex/y.html b/testing/test_package_docs_dev/ex/y.html
index 8246dc599c..41457abdd1 100644
--- a/testing/test_package_docs_dev/ex/y.html
+++ b/testing/test_package_docs_dev/ex/y.html
@@ -69,6 +69,7 @@ <h5>ex library</h5>
       <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
       <li><a href="ex/WithGenericSub-class.html">WithGenericSub</a></li>
     
+    
       <li class="section-title"><a href="ex/ex-library.html#constants">Constants</a></li>
       <li><a href="ex/COLOR-constant.html">COLOR</a></li>
       <li><a href="ex/COLOR_GREEN-constant.html">COLOR_GREEN</a></li>
diff --git a/testing/test_package_docs_dev/fake/ABaseClass-class.html b/testing/test_package_docs_dev/fake/ABaseClass-class.html
index f8cdf4c330..4e8ee17001 100644
--- a/testing/test_package_docs_dev/fake/ABaseClass-class.html
+++ b/testing/test_package_docs_dev/fake/ABaseClass-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/AClassUsingASuperMixin-class.html b/testing/test_package_docs_dev/fake/AClassUsingASuperMixin-class.html
index b417ecf778..dc919cc819 100644
--- a/testing/test_package_docs_dev/fake/AClassUsingASuperMixin-class.html
+++ b/testing/test_package_docs_dev/fake/AClassUsingASuperMixin-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/AClassUsingNewStyleMixin-class.html b/testing/test_package_docs_dev/fake/AClassUsingNewStyleMixin-class.html
new file mode 100644
index 0000000000..c8f8f4bf4a
--- /dev/null
+++ b/testing/test_package_docs_dev/fake/AClassUsingNewStyleMixin-class.html
@@ -0,0 +1,327 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the AClassUsingNewStyleMixin class from the fake library, for the Dart programming language.">
+  <title>AClassUsingNewStyleMixin class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li class="self-crumb">AClassUsingNewStyleMixin class</li>
+  </ol>
+  <div class="self-name">AClassUsingNewStyleMixin</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>fake library</h5>
+    <ol>
+      <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
+      <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
+      <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
+      <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
+      <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
+      <li><a href="fake/Annotation-class.html">Annotation</a></li>
+      <li><a href="fake/AnotherInterface-class.html">AnotherInterface</a></li>
+      <li><a href="fake/ATypeTakingClass-class.html">ATypeTakingClass</a></li>
+      <li><a href="fake/ATypeTakingClassMixedIn-class.html">ATypeTakingClassMixedIn</a></li>
+      <li><a href="fake/BaseForDocComments-class.html">BaseForDocComments</a></li>
+      <li><a href="fake/BaseThingy-class.html">BaseThingy</a></li>
+      <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
+      <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
+      <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
+      <li><a href="fake/Cool-class.html">Cool</a></li>
+      <li><a href="fake/DocumentWithATable-class.html">DocumentWithATable</a></li>
+      <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
+      <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
+      <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
+      <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
+      <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
+      <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
+      <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
+      <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
+      <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
+      <li><a href="fake/ImplicitProperties-class.html">ImplicitProperties</a></li>
+      <li><a href="fake/InheritingClassOne-class.html">InheritingClassOne</a></li>
+      <li><a href="fake/InheritingClassTwo-class.html">InheritingClassTwo</a></li>
+      <li><a href="fake/Interface-class.html">Interface</a></li>
+      <li><a href="fake/LongFirstLine-class.html">LongFirstLine</a></li>
+      <li><a href="fake/MIEEBase-class.html">MIEEBase</a></li>
+      <li><a href="fake/MIEEMixin-class.html">MIEEMixin</a></li>
+      <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
+      <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
+      <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
+      <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
+      <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
+      <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
+      <li><a href="fake/ReferringClass-class.html">ReferringClass</a></li>
+      <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+      <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
+      <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
+      <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
+      <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
+      <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
+      <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
+      <li><a href="fake/CUSTOM_CLASS_PRIVATE-constant.html">CUSTOM_CLASS_PRIVATE</a></li>
+      <li><a class="deprecated" href="fake/DOWN-constant.html">DOWN</a></li>
+      <li><a href="fake/greatAnnotation-constant.html">greatAnnotation</a></li>
+      <li><a href="fake/greatestAnnotation-constant.html">greatestAnnotation</a></li>
+      <li><a href="fake/incorrectDocReference-constant.html">incorrectDocReference</a></li>
+      <li><a href="fake/myMap-constant.html">myMap</a></li>
+      <li><a href="fake/NAME_SINGLEUNDERSCORE-constant.html">NAME_SINGLEUNDERSCORE</a></li>
+      <li><a href="fake/NAME_WITH_TWO_UNDERSCORES-constant.html">NAME_WITH_TWO_UNDERSCORES</a></li>
+      <li><a href="fake/PI-constant.html">PI</a></li>
+      <li><a href="fake/required-constant.html">required</a></li>
+      <li><a href="fake/testingCodeSyntaxInOneLiners-constant.html">testingCodeSyntaxInOneLiners</a></li>
+      <li><a href="fake/UP-constant.html">UP</a></li>
+      <li><a href="fake/ZERO-constant.html">ZERO</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
+      <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
+      <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
+      <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
+      <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
+      <li><a href="fake/justGetter.html">justGetter</a></li>
+      <li><a href="fake/justSetter.html">justSetter</a></li>
+      <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
+      <li><a class="deprecated" href="fake/meaningOfLife.html">meaningOfLife</a></li>
+      <li><a href="fake/mustGetThis.html">mustGetThis</a></li>
+      <li><a href="fake/setAndGet.html">setAndGet</a></li>
+      <li><a href="fake/simpleProperty.html">simpleProperty</a></li>
+      <li><a href="fake/useSomethingInAnotherPackage.html">useSomethingInAnotherPackage</a></li>
+      <li><a href="fake/useSomethingInTheSdk.html">useSomethingInTheSdk</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#functions">Functions</a></li>
+      <li><a href="fake/addCallback.html">addCallback</a></li>
+      <li><a href="fake/addCallback2.html">addCallback2</a></li>
+      <li><a href="fake/aVoidParameter.html">aVoidParameter</a></li>
+      <li><a href="fake/functionWithFunctionParameters.html">functionWithFunctionParameters</a></li>
+      <li><a href="fake/myGenericFunction.html">myGenericFunction</a></li>
+      <li><a href="fake/onlyPositionalWithNoDefaultNoType.html">onlyPositionalWithNoDefaultNoType</a></li>
+      <li><a href="fake/paintImage1.html">paintImage1</a></li>
+      <li><a href="fake/paintImage2.html">paintImage2</a></li>
+      <li><a href="fake/paramFromAnotherLib.html">paramFromAnotherLib</a></li>
+      <li><a href="fake/paramOfFutureOrNull.html">paramOfFutureOrNull</a></li>
+      <li><a href="fake/returningFutureVoid.html">returningFutureVoid</a></li>
+      <li><a href="fake/short.html">short</a></li>
+      <li><a href="fake/soIntense.html">soIntense</a></li>
+      <li><a href="fake/thisIsAlsoAsync.html">thisIsAlsoAsync</a></li>
+      <li><a href="fake/thisIsAsync.html">thisIsAsync</a></li>
+      <li><a href="fake/thisIsFutureOr.html">thisIsFutureOr</a></li>
+      <li><a href="fake/thisIsFutureOrNull.html">thisIsFutureOrNull</a></li>
+      <li><a href="fake/thisIsFutureOrT.html">thisIsFutureOrT</a></li>
+      <li><a class="deprecated" href="fake/topLevelFunction.html">topLevelFunction</a></li>
+      <li><a href="fake/typeParamOfFutureOr.html">typeParamOfFutureOr</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#enums">Enums</a></li>
+      <li><a href="fake/Color-class.html">Color</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#typedefs">Typedefs</a></li>
+      <li><a href="fake/Callback2.html">Callback2</a></li>
+      <li><a class="deprecated" href="fake/FakeProcesses.html">FakeProcesses</a></li>
+      <li><a href="fake/GenericTypedef.html">GenericTypedef</a></li>
+      <li><a href="fake/LotsAndLotsOfParameters.html">LotsAndLotsOfParameters</a></li>
+      <li><a href="fake/myCoolTypedef.html">myCoolTypedef</a></li>
+      <li><a href="fake/NewGenericTypedef.html">NewGenericTypedef</a></li>
+      <li><a href="fake/VoidCallback.html">VoidCallback</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#exceptions">Exceptions</a></li>
+      <li><a class="deprecated" href="fake/Doh-class.html">Doh</a></li>
+      <li><a href="fake/Oops-class.html">Oops</a></li>
+    </ol>
+  </div>
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+      <h1>AClassUsingNewStyleMixin class </h1>
+
+    <section class="desc markdown">
+      <p>A class mixing in a single new-style mixin.</p>
+    </section>
+    
+    <section>
+      <dl class="dl-horizontal">
+        <dt>Inheritance</dt>
+        <dd><ul class="gt-separated dark clazz-relationships">
+          <li>Object</li>
+          <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
+          <li>AClassUsingNewStyleMixin</li>
+        </ul></dd>
+
+
+        <dt>Mixed in types</dt>
+        <dd><ul class="comma-separated clazz-relationships">
+          <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+        </ul></dd>
+
+
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor" id="constructors">
+      <h2>Constructors</h2>
+
+      <dl class="constructor-summary-list">
+        <dt id="AClassUsingNewStyleMixin" class="callable">
+          <span class="name"><a href="fake/AClassUsingNewStyleMixin/AClassUsingNewStyleMixin.html">AClassUsingNewStyleMixin</a></span><span class="signature">()</span>
+        </dt>
+        <dd>
+          
+        </dd>
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor inherited" id="instance-properties">
+      <h2>Properties</h2>
+
+      <dl class="properties">
+        <dt id="hashCode" class="property inherited">
+          <span class="name"><a href="fake/NotAMixin/hashCode.html">hashCode</a></span>
+          <span class="signature">&#8594; int</span> 
+        </dt>
+        <dd class="inherited">
+          
+          <div class="features">read-only, inherited</div>
+</dd>
+        <dt id="runtimeType" class="property inherited">
+          <span class="name"><a href="fake/NotAMixin/runtimeType.html">runtimeType</a></span>
+          <span class="signature">&#8594; Type</span> 
+        </dt>
+        <dd class="inherited">
+          
+          <div class="features">read-only, inherited</div>
+</dd>
+        <dt id="superString" class="property inherited">
+          <span class="name"><a href="fake/NewStyleMixinCallingSuper/superString.html">superString</a></span>
+          <span class="signature">&#8594; String</span> 
+        </dt>
+        <dd class="inherited">
+          I have documentation for an overridden method named <a href="fake/NewStyleMixinCallingSuper/superString.html">superString</a>,
+different from <a href="fake/NotAMixin/superString.html">NotAMixin.superString</a>.
+          <div class="features">read-only, inherited</div>
+</dd>
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor inherited" id="instance-methods">
+      <h2>Methods</h2>
+      <dl class="callables">
+        <dt id="noSuchMethod" class="callable inherited">
+          <span class="name"><a href="fake/NotAMixin/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
+            <span class="returntype parameter">&#8594; dynamic</span>
+          </span>
+          </dt>
+        <dd class="inherited">
+          
+          <div class="features">inherited</div>
+</dd>
+        <dt id="toString" class="callable inherited">
+          <span class="name"><a href="fake/NotAMixin/toString.html">toString</a></span><span class="signature">(<wbr>)
+            <span class="returntype parameter">&#8594; String</span>
+          </span>
+          </dt>
+        <dd class="inherited">
+          
+          <div class="features">inherited</div>
+</dd>
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor inherited" id="operators">
+      <h2>Operators</h2>
+      <dl class="callables">
+        <dt id="operator ==" class="callable inherited">
+          <span class="name"><a href="fake/NotAMixin/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
+            <span class="returntype parameter">&#8594; bool</span>
+          </span>
+          </dt>
+        <dd class="inherited">
+          
+          <div class="features">inherited</div>
+</dd>
+      </dl>
+    </section>
+
+
+
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+    <ol>
+      <li class="section-title"><a href="fake/AClassUsingNewStyleMixin-class.html#constructors">Constructors</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin/AClassUsingNewStyleMixin.html">AClassUsingNewStyleMixin</a></li>
+    
+      <li class="section-title inherited">
+        <a href="fake/AClassUsingNewStyleMixin-class.html#instance-properties">Properties</a>
+      </li>
+      <li class="inherited"><a href="fake/NotAMixin/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/NotAMixin/runtimeType.html">runtimeType</a></li>
+      <li class="inherited"><a href="fake/NewStyleMixinCallingSuper/superString.html">superString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/AClassUsingNewStyleMixin-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/NotAMixin/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/NotAMixin/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/AClassUsingNewStyleMixin-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/NotAMixin/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs_dev/fake/AClassUsingNewStyleMixin/AClassUsingNewStyleMixin.html b/testing/test_package_docs_dev/fake/AClassUsingNewStyleMixin/AClassUsingNewStyleMixin.html
new file mode 100644
index 0000000000..c8750dfc13
--- /dev/null
+++ b/testing/test_package_docs_dev/fake/AClassUsingNewStyleMixin/AClassUsingNewStyleMixin.html
@@ -0,0 +1,98 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the AClassUsingNewStyleMixin constructor from the Class AClassUsingNewStyleMixin class from the fake library, for the Dart programming language.">
+  <title>AClassUsingNewStyleMixin constructor - AClassUsingNewStyleMixin class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
+    <li class="self-crumb">AClassUsingNewStyleMixin constructor</li>
+  </ol>
+  <div class="self-name">AClassUsingNewStyleMixin</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>AClassUsingNewStyleMixin class</h5>
+    <ol>
+      <li class="section-title"><a href="fake/AClassUsingNewStyleMixin-class.html#constructors">Constructors</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin/AClassUsingNewStyleMixin.html">AClassUsingNewStyleMixin</a></li>
+    
+      <li class="section-title inherited">
+        <a href="fake/AClassUsingNewStyleMixin-class.html#instance-properties">Properties</a>
+      </li>
+      <li class="inherited"><a href="fake/NotAMixin/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/NotAMixin/runtimeType.html">runtimeType</a></li>
+      <li class="inherited"><a href="fake/NewStyleMixinCallingSuper/superString.html">superString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/AClassUsingNewStyleMixin-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/NotAMixin/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/NotAMixin/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/AClassUsingNewStyleMixin-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/NotAMixin/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-left-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>AClassUsingNewStyleMixin constructor</h1>
+
+    <section class="multi-line-signature">
+      
+      <span class="name ">AClassUsingNewStyleMixin</span>(<wbr>)
+    </section>
+
+    
+    
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs_dev/fake/AClassWithFancyProperties-class.html b/testing/test_package_docs_dev/fake/AClassWithFancyProperties-class.html
index a20883841f..3371adde0b 100644
--- a/testing/test_package_docs_dev/fake/AClassWithFancyProperties-class.html
+++ b/testing/test_package_docs_dev/fake/AClassWithFancyProperties-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/AMixinCallingSuper-class.html b/testing/test_package_docs_dev/fake/AMixinCallingSuper-class.html
index 22fff0f308..07c98fcb90 100644
--- a/testing/test_package_docs_dev/fake/AMixinCallingSuper-class.html
+++ b/testing/test_package_docs_dev/fake/AMixinCallingSuper-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/ATypeTakingClass-class.html b/testing/test_package_docs_dev/fake/ATypeTakingClass-class.html
index a9fda66640..6ef98a1d28 100644
--- a/testing/test_package_docs_dev/fake/ATypeTakingClass-class.html
+++ b/testing/test_package_docs_dev/fake/ATypeTakingClass-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/ATypeTakingClassMixedIn-class.html b/testing/test_package_docs_dev/fake/ATypeTakingClassMixedIn-class.html
index dbfba684f5..b5593a51ff 100644
--- a/testing/test_package_docs_dev/fake/ATypeTakingClassMixedIn-class.html
+++ b/testing/test_package_docs_dev/fake/ATypeTakingClassMixedIn-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/Annotation-class.html b/testing/test_package_docs_dev/fake/Annotation-class.html
index 40b93946cf..d06d9a42fc 100644
--- a/testing/test_package_docs_dev/fake/Annotation-class.html
+++ b/testing/test_package_docs_dev/fake/Annotation-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/AnotherInterface-class.html b/testing/test_package_docs_dev/fake/AnotherInterface-class.html
index 52dc332346..ab3f4174da 100644
--- a/testing/test_package_docs_dev/fake/AnotherInterface-class.html
+++ b/testing/test_package_docs_dev/fake/AnotherInterface-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/BaseForDocComments-class.html b/testing/test_package_docs_dev/fake/BaseForDocComments-class.html
index b0f7d74f57..984513514e 100644
--- a/testing/test_package_docs_dev/fake/BaseForDocComments-class.html
+++ b/testing/test_package_docs_dev/fake/BaseForDocComments-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/BaseThingy-class.html b/testing/test_package_docs_dev/fake/BaseThingy-class.html
index 2063ccc867..2302bb6399 100644
--- a/testing/test_package_docs_dev/fake/BaseThingy-class.html
+++ b/testing/test_package_docs_dev/fake/BaseThingy-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/BaseThingy2-class.html b/testing/test_package_docs_dev/fake/BaseThingy2-class.html
index d65ed39c91..d277d75ab6 100644
--- a/testing/test_package_docs_dev/fake/BaseThingy2-class.html
+++ b/testing/test_package_docs_dev/fake/BaseThingy2-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/CUSTOM_CLASS-constant.html b/testing/test_package_docs_dev/fake/CUSTOM_CLASS-constant.html
index 8eb56be916..2474f645eb 100644
--- a/testing/test_package_docs_dev/fake/CUSTOM_CLASS-constant.html
+++ b/testing/test_package_docs_dev/fake/CUSTOM_CLASS-constant.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/CUSTOM_CLASS_PRIVATE-constant.html b/testing/test_package_docs_dev/fake/CUSTOM_CLASS_PRIVATE-constant.html
index 94e604c0d0..d9a3e482c1 100644
--- a/testing/test_package_docs_dev/fake/CUSTOM_CLASS_PRIVATE-constant.html
+++ b/testing/test_package_docs_dev/fake/CUSTOM_CLASS_PRIVATE-constant.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/Callback2.html b/testing/test_package_docs_dev/fake/Callback2.html
index 21dd36c16c..733174aac1 100644
--- a/testing/test_package_docs_dev/fake/Callback2.html
+++ b/testing/test_package_docs_dev/fake/Callback2.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/ClassWithUnusualProperties-class.html b/testing/test_package_docs_dev/fake/ClassWithUnusualProperties-class.html
index c02a13fcfe..c103d1604b 100644
--- a/testing/test_package_docs_dev/fake/ClassWithUnusualProperties-class.html
+++ b/testing/test_package_docs_dev/fake/ClassWithUnusualProperties-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/Color-class.html b/testing/test_package_docs_dev/fake/Color-class.html
index 5d74055e04..0eab08c62f 100644
--- a/testing/test_package_docs_dev/fake/Color-class.html
+++ b/testing/test_package_docs_dev/fake/Color-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/ConstantClass-class.html b/testing/test_package_docs_dev/fake/ConstantClass-class.html
index 94a494fb7f..6878764acf 100644
--- a/testing/test_package_docs_dev/fake/ConstantClass-class.html
+++ b/testing/test_package_docs_dev/fake/ConstantClass-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/ConstructorTester-class.html b/testing/test_package_docs_dev/fake/ConstructorTester-class.html
index 71beb6c9a8..cc9f6f6e3f 100644
--- a/testing/test_package_docs_dev/fake/ConstructorTester-class.html
+++ b/testing/test_package_docs_dev/fake/ConstructorTester-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/Cool-class.html b/testing/test_package_docs_dev/fake/Cool-class.html
index 7ef6fe31bf..da4ec2ef11 100644
--- a/testing/test_package_docs_dev/fake/Cool-class.html
+++ b/testing/test_package_docs_dev/fake/Cool-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/DOWN-constant.html b/testing/test_package_docs_dev/fake/DOWN-constant.html
index 1831af6791..fbdf501356 100644
--- a/testing/test_package_docs_dev/fake/DOWN-constant.html
+++ b/testing/test_package_docs_dev/fake/DOWN-constant.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/DocumentWithATable-class.html b/testing/test_package_docs_dev/fake/DocumentWithATable-class.html
index e7892023ad..2bb1abb709 100644
--- a/testing/test_package_docs_dev/fake/DocumentWithATable-class.html
+++ b/testing/test_package_docs_dev/fake/DocumentWithATable-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/Doh-class.html b/testing/test_package_docs_dev/fake/Doh-class.html
index e7b4c98863..f1265becaa 100644
--- a/testing/test_package_docs_dev/fake/Doh-class.html
+++ b/testing/test_package_docs_dev/fake/Doh-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/ExtendsFutureVoid-class.html b/testing/test_package_docs_dev/fake/ExtendsFutureVoid-class.html
index 90f28ea278..2e46159064 100644
--- a/testing/test_package_docs_dev/fake/ExtendsFutureVoid-class.html
+++ b/testing/test_package_docs_dev/fake/ExtendsFutureVoid-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/ExtraSpecialList-class.html b/testing/test_package_docs_dev/fake/ExtraSpecialList-class.html
index 8b71cb0cb5..6e40fe2ef5 100644
--- a/testing/test_package_docs_dev/fake/ExtraSpecialList-class.html
+++ b/testing/test_package_docs_dev/fake/ExtraSpecialList-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
@@ -171,7 +179,7 @@ <h1>ExtraSpecialList&lt;<wbr><span class="type-parameter">E</span>&gt; class </h
         <dt>Inheritance</dt>
         <dd><ul class="gt-separated dark clazz-relationships">
           <li>Object</li>
-          <li>ListBase<span class="signature">&lt;<wbr><span class="type-parameter">E</span>&gt;</span></li>
+          <li>ListBase</li>
           <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
           <li>ExtraSpecialList</li>
         </ul></dd>
diff --git a/testing/test_package_docs_dev/fake/FakeProcesses.html b/testing/test_package_docs_dev/fake/FakeProcesses.html
index eb04ef9ccb..47de59db4c 100644
--- a/testing/test_package_docs_dev/fake/FakeProcesses.html
+++ b/testing/test_package_docs_dev/fake/FakeProcesses.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/Foo2-class.html b/testing/test_package_docs_dev/fake/Foo2-class.html
index 4ed3474062..33426ceb87 100644
--- a/testing/test_package_docs_dev/fake/Foo2-class.html
+++ b/testing/test_package_docs_dev/fake/Foo2-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/GenericClass-class.html b/testing/test_package_docs_dev/fake/GenericClass-class.html
new file mode 100644
index 0000000000..68ee09a62d
--- /dev/null
+++ b/testing/test_package_docs_dev/fake/GenericClass-class.html
@@ -0,0 +1,356 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the GenericClass class from the fake library, for the Dart programming language.">
+  <title>GenericClass class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li class="self-crumb">GenericClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span> class</li>
+  </ol>
+  <div class="self-name">GenericClass</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>fake library</h5>
+    <ol>
+      <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
+      <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
+      <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
+      <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
+      <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
+      <li><a href="fake/Annotation-class.html">Annotation</a></li>
+      <li><a href="fake/AnotherInterface-class.html">AnotherInterface</a></li>
+      <li><a href="fake/ATypeTakingClass-class.html">ATypeTakingClass</a></li>
+      <li><a href="fake/ATypeTakingClassMixedIn-class.html">ATypeTakingClassMixedIn</a></li>
+      <li><a href="fake/BaseForDocComments-class.html">BaseForDocComments</a></li>
+      <li><a href="fake/BaseThingy-class.html">BaseThingy</a></li>
+      <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
+      <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
+      <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
+      <li><a href="fake/Cool-class.html">Cool</a></li>
+      <li><a href="fake/DocumentWithATable-class.html">DocumentWithATable</a></li>
+      <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
+      <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
+      <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
+      <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
+      <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
+      <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
+      <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
+      <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
+      <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
+      <li><a href="fake/ImplicitProperties-class.html">ImplicitProperties</a></li>
+      <li><a href="fake/InheritingClassOne-class.html">InheritingClassOne</a></li>
+      <li><a href="fake/InheritingClassTwo-class.html">InheritingClassTwo</a></li>
+      <li><a href="fake/Interface-class.html">Interface</a></li>
+      <li><a href="fake/LongFirstLine-class.html">LongFirstLine</a></li>
+      <li><a href="fake/MIEEBase-class.html">MIEEBase</a></li>
+      <li><a href="fake/MIEEMixin-class.html">MIEEMixin</a></li>
+      <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
+      <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
+      <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
+      <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
+      <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
+      <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
+      <li><a href="fake/ReferringClass-class.html">ReferringClass</a></li>
+      <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+      <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
+      <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
+      <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
+      <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
+      <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
+      <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
+      <li><a href="fake/CUSTOM_CLASS_PRIVATE-constant.html">CUSTOM_CLASS_PRIVATE</a></li>
+      <li><a class="deprecated" href="fake/DOWN-constant.html">DOWN</a></li>
+      <li><a href="fake/greatAnnotation-constant.html">greatAnnotation</a></li>
+      <li><a href="fake/greatestAnnotation-constant.html">greatestAnnotation</a></li>
+      <li><a href="fake/incorrectDocReference-constant.html">incorrectDocReference</a></li>
+      <li><a href="fake/myMap-constant.html">myMap</a></li>
+      <li><a href="fake/NAME_SINGLEUNDERSCORE-constant.html">NAME_SINGLEUNDERSCORE</a></li>
+      <li><a href="fake/NAME_WITH_TWO_UNDERSCORES-constant.html">NAME_WITH_TWO_UNDERSCORES</a></li>
+      <li><a href="fake/PI-constant.html">PI</a></li>
+      <li><a href="fake/required-constant.html">required</a></li>
+      <li><a href="fake/testingCodeSyntaxInOneLiners-constant.html">testingCodeSyntaxInOneLiners</a></li>
+      <li><a href="fake/UP-constant.html">UP</a></li>
+      <li><a href="fake/ZERO-constant.html">ZERO</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
+      <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
+      <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
+      <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
+      <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
+      <li><a href="fake/justGetter.html">justGetter</a></li>
+      <li><a href="fake/justSetter.html">justSetter</a></li>
+      <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
+      <li><a class="deprecated" href="fake/meaningOfLife.html">meaningOfLife</a></li>
+      <li><a href="fake/mustGetThis.html">mustGetThis</a></li>
+      <li><a href="fake/setAndGet.html">setAndGet</a></li>
+      <li><a href="fake/simpleProperty.html">simpleProperty</a></li>
+      <li><a href="fake/useSomethingInAnotherPackage.html">useSomethingInAnotherPackage</a></li>
+      <li><a href="fake/useSomethingInTheSdk.html">useSomethingInTheSdk</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#functions">Functions</a></li>
+      <li><a href="fake/addCallback.html">addCallback</a></li>
+      <li><a href="fake/addCallback2.html">addCallback2</a></li>
+      <li><a href="fake/aVoidParameter.html">aVoidParameter</a></li>
+      <li><a href="fake/functionWithFunctionParameters.html">functionWithFunctionParameters</a></li>
+      <li><a href="fake/myGenericFunction.html">myGenericFunction</a></li>
+      <li><a href="fake/onlyPositionalWithNoDefaultNoType.html">onlyPositionalWithNoDefaultNoType</a></li>
+      <li><a href="fake/paintImage1.html">paintImage1</a></li>
+      <li><a href="fake/paintImage2.html">paintImage2</a></li>
+      <li><a href="fake/paramFromAnotherLib.html">paramFromAnotherLib</a></li>
+      <li><a href="fake/paramOfFutureOrNull.html">paramOfFutureOrNull</a></li>
+      <li><a href="fake/returningFutureVoid.html">returningFutureVoid</a></li>
+      <li><a href="fake/short.html">short</a></li>
+      <li><a href="fake/soIntense.html">soIntense</a></li>
+      <li><a href="fake/thisIsAlsoAsync.html">thisIsAlsoAsync</a></li>
+      <li><a href="fake/thisIsAsync.html">thisIsAsync</a></li>
+      <li><a href="fake/thisIsFutureOr.html">thisIsFutureOr</a></li>
+      <li><a href="fake/thisIsFutureOrNull.html">thisIsFutureOrNull</a></li>
+      <li><a href="fake/thisIsFutureOrT.html">thisIsFutureOrT</a></li>
+      <li><a class="deprecated" href="fake/topLevelFunction.html">topLevelFunction</a></li>
+      <li><a href="fake/typeParamOfFutureOr.html">typeParamOfFutureOr</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#enums">Enums</a></li>
+      <li><a href="fake/Color-class.html">Color</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#typedefs">Typedefs</a></li>
+      <li><a href="fake/Callback2.html">Callback2</a></li>
+      <li><a class="deprecated" href="fake/FakeProcesses.html">FakeProcesses</a></li>
+      <li><a href="fake/GenericTypedef.html">GenericTypedef</a></li>
+      <li><a href="fake/LotsAndLotsOfParameters.html">LotsAndLotsOfParameters</a></li>
+      <li><a href="fake/myCoolTypedef.html">myCoolTypedef</a></li>
+      <li><a href="fake/NewGenericTypedef.html">NewGenericTypedef</a></li>
+      <li><a href="fake/VoidCallback.html">VoidCallback</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#exceptions">Exceptions</a></li>
+      <li><a class="deprecated" href="fake/Doh-class.html">Doh</a></li>
+      <li><a href="fake/Oops-class.html">Oops</a></li>
+    </ol>
+  </div>
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+      <h1>GenericClass&lt;<wbr><span class="type-parameter">T</span>&gt; class </h1>
+
+    <section class="desc markdown">
+      <p>A generic class for testing type inference.</p>
+    </section>
+    
+    <section>
+      <dl class="dl-horizontal">
+
+
+
+        <dt>Implementers</dt>
+        <dd><ul class="comma-separated clazz-relationships">
+          <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
+        </ul></dd>
+
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor" id="constructors">
+      <h2>Constructors</h2>
+
+      <dl class="constructor-summary-list">
+        <dt id="GenericClass" class="callable">
+          <span class="name"><a href="fake/GenericClass/GenericClass.html">GenericClass</a></span><span class="signature">()</span>
+        </dt>
+        <dd>
+          
+        </dd>
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor" id="instance-properties">
+      <h2>Properties</h2>
+
+      <dl class="properties">
+        <dt id="member" class="property">
+          <span class="name"><a href="fake/GenericClass/member.html">member</a></span>
+          <span class="signature">&#8596; T</span> 
+        </dt>
+        <dd>
+          
+          <div class="features">read / write</div>
+</dd>
+        <dt id="overrideByBoth" class="property">
+          <span class="name"><a href="fake/GenericClass/overrideByBoth.html">overrideByBoth</a></span>
+          <span class="signature">&#8596; T</span> 
+        </dt>
+        <dd>
+          Destined to be overridden by <a href="fake/ModifierClass-class.html">ModifierClass</a> and <a href="fake/GenericMixin-mixin.html">GenericMixin</a>, both.
+          <div class="features">read / write</div>
+</dd>
+        <dt id="overrideByEverything" class="property">
+          <span class="name"><a href="fake/GenericClass/overrideByEverything.html">overrideByEverything</a></span>
+          <span class="signature">&#8596; T</span> 
+        </dt>
+        <dd>
+          Destined to be overridden by everything.
+          <div class="features">read / write</div>
+</dd>
+        <dt id="overrideByGenericMixin" class="property">
+          <span class="name"><a href="fake/GenericClass/overrideByGenericMixin.html">overrideByGenericMixin</a></span>
+          <span class="signature">&#8596; T</span> 
+        </dt>
+        <dd>
+          Destined to be overridden by <a href="fake/GenericMixin-mixin.html">GenericMixin</a>.
+          <div class="features">read / write</div>
+</dd>
+        <dt id="overrideByModifierClass" class="property">
+          <span class="name"><a href="fake/GenericClass/overrideByModifierClass.html">overrideByModifierClass</a></span>
+          <span class="signature">&#8596; T</span> 
+        </dt>
+        <dd>
+          Destined to be overridden by <a href="fake/ModifierClass-class.html">ModifierClass</a>.
+          <div class="features">read / write</div>
+</dd>
+        <dt id="hashCode" class="property inherited">
+          <span class="name"><a href="fake/GenericClass/hashCode.html">hashCode</a></span>
+          <span class="signature">&#8594; int</span> 
+        </dt>
+        <dd class="inherited">
+          
+          <div class="features">read-only, inherited</div>
+</dd>
+        <dt id="runtimeType" class="property inherited">
+          <span class="name"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></span>
+          <span class="signature">&#8594; Type</span> 
+        </dt>
+        <dd class="inherited">
+          
+          <div class="features">read-only, inherited</div>
+</dd>
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor inherited" id="instance-methods">
+      <h2>Methods</h2>
+      <dl class="callables">
+        <dt id="noSuchMethod" class="callable inherited">
+          <span class="name"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
+            <span class="returntype parameter">&#8594; dynamic</span>
+          </span>
+          </dt>
+        <dd class="inherited">
+          
+          <div class="features">inherited</div>
+</dd>
+        <dt id="toString" class="callable inherited">
+          <span class="name"><a href="fake/GenericClass/toString.html">toString</a></span><span class="signature">(<wbr>)
+            <span class="returntype parameter">&#8594; String</span>
+          </span>
+          </dt>
+        <dd class="inherited">
+          
+          <div class="features">inherited</div>
+</dd>
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor inherited" id="operators">
+      <h2>Operators</h2>
+      <dl class="callables">
+        <dt id="operator ==" class="callable inherited">
+          <span class="name"><a href="fake/GenericClass/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
+            <span class="returntype parameter">&#8594; bool</span>
+          </span>
+          </dt>
+        <dd class="inherited">
+          
+          <div class="features">inherited</div>
+</dd>
+      </dl>
+    </section>
+
+
+
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+    <ol>
+      <li class="section-title"><a href="fake/GenericClass-class.html#constructors">Constructors</a></li>
+      <li><a href="fake/GenericClass/GenericClass.html">GenericClass</a></li>
+    
+      <li class="section-title">
+        <a href="fake/GenericClass-class.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/GenericClass/member.html">member</a></li>
+      <li><a href="fake/GenericClass/overrideByBoth.html">overrideByBoth</a></li>
+      <li><a href="fake/GenericClass/overrideByEverything.html">overrideByEverything</a></li>
+      <li><a href="fake/GenericClass/overrideByGenericMixin.html">overrideByGenericMixin</a></li>
+      <li><a href="fake/GenericClass/overrideByModifierClass.html">overrideByModifierClass</a></li>
+      <li class="inherited"><a href="fake/GenericClass/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericClass-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/GenericClass/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericClass-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/GenericClass/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs_dev/fake/GenericClass/GenericClass.html b/testing/test_package_docs_dev/fake/GenericClass/GenericClass.html
new file mode 100644
index 0000000000..c960cf26c6
--- /dev/null
+++ b/testing/test_package_docs_dev/fake/GenericClass/GenericClass.html
@@ -0,0 +1,102 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the GenericClass constructor from the Class GenericClass class from the fake library, for the Dart programming language.">
+  <title>GenericClass constructor - GenericClass class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/GenericClass-class.html">GenericClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
+    <li class="self-crumb">GenericClass constructor</li>
+  </ol>
+  <div class="self-name">GenericClass</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>GenericClass class</h5>
+    <ol>
+      <li class="section-title"><a href="fake/GenericClass-class.html#constructors">Constructors</a></li>
+      <li><a href="fake/GenericClass/GenericClass.html">GenericClass</a></li>
+    
+      <li class="section-title">
+        <a href="fake/GenericClass-class.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/GenericClass/member.html">member</a></li>
+      <li><a href="fake/GenericClass/overrideByBoth.html">overrideByBoth</a></li>
+      <li><a href="fake/GenericClass/overrideByEverything.html">overrideByEverything</a></li>
+      <li><a href="fake/GenericClass/overrideByGenericMixin.html">overrideByGenericMixin</a></li>
+      <li><a href="fake/GenericClass/overrideByModifierClass.html">overrideByModifierClass</a></li>
+      <li class="inherited"><a href="fake/GenericClass/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericClass-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/GenericClass/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericClass-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/GenericClass/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-left-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>GenericClass&lt;<wbr><span class="type-parameter">T</span>&gt; constructor</h1>
+
+    <section class="multi-line-signature">
+      
+      <span class="name ">GenericClass&lt;<wbr><span class="type-parameter">T</span>&gt;</span>(<wbr>)
+    </section>
+
+    
+    
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs_dev/fake/GenericClass/hashCode.html b/testing/test_package_docs_dev/fake/GenericClass/hashCode.html
new file mode 100644
index 0000000000..01339153d1
--- /dev/null
+++ b/testing/test_package_docs_dev/fake/GenericClass/hashCode.html
@@ -0,0 +1,106 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the hashCode property from the GenericClass class, for the Dart programming language.">
+  <title>hashCode property - GenericClass class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/GenericClass-class.html">GenericClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
+    <li class="self-crumb">hashCode property</li>
+  </ol>
+  <div class="self-name">hashCode</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>GenericClass class</h5>
+    <ol>
+      <li class="section-title"><a href="fake/GenericClass-class.html#constructors">Constructors</a></li>
+      <li><a href="fake/GenericClass/GenericClass.html">GenericClass</a></li>
+    
+      <li class="section-title">
+        <a href="fake/GenericClass-class.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/GenericClass/member.html">member</a></li>
+      <li><a href="fake/GenericClass/overrideByBoth.html">overrideByBoth</a></li>
+      <li><a href="fake/GenericClass/overrideByEverything.html">overrideByEverything</a></li>
+      <li><a href="fake/GenericClass/overrideByGenericMixin.html">overrideByGenericMixin</a></li>
+      <li><a href="fake/GenericClass/overrideByModifierClass.html">overrideByModifierClass</a></li>
+      <li class="inherited"><a href="fake/GenericClass/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericClass-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/GenericClass/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericClass-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/GenericClass/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>hashCode property</h1>
+
+
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>
+  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs_dev/fake/GenericClass/member.html b/testing/test_package_docs_dev/fake/GenericClass/member.html
new file mode 100644
index 0000000000..8bc1527566
--- /dev/null
+++ b/testing/test_package_docs_dev/fake/GenericClass/member.html
@@ -0,0 +1,101 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the member property from the GenericClass class, for the Dart programming language.">
+  <title>member property - GenericClass class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/GenericClass-class.html">GenericClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
+    <li class="self-crumb">member property</li>
+  </ol>
+  <div class="self-name">member</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>GenericClass class</h5>
+    <ol>
+      <li class="section-title"><a href="fake/GenericClass-class.html#constructors">Constructors</a></li>
+      <li><a href="fake/GenericClass/GenericClass.html">GenericClass</a></li>
+    
+      <li class="section-title">
+        <a href="fake/GenericClass-class.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/GenericClass/member.html">member</a></li>
+      <li><a href="fake/GenericClass/overrideByBoth.html">overrideByBoth</a></li>
+      <li><a href="fake/GenericClass/overrideByEverything.html">overrideByEverything</a></li>
+      <li><a href="fake/GenericClass/overrideByGenericMixin.html">overrideByGenericMixin</a></li>
+      <li><a href="fake/GenericClass/overrideByModifierClass.html">overrideByModifierClass</a></li>
+      <li class="inherited"><a href="fake/GenericClass/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericClass-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/GenericClass/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericClass-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/GenericClass/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>member property</h1>
+
+        <section class="multi-line-signature">
+          <span class="returntype">T</span>
+          <span class="name ">member</span>
+          <div class="features">read / write</div>
+        </section>
+                
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs_dev/fake/GenericClass/noSuchMethod.html b/testing/test_package_docs_dev/fake/GenericClass/noSuchMethod.html
new file mode 100644
index 0000000000..d703b87477
--- /dev/null
+++ b/testing/test_package_docs_dev/fake/GenericClass/noSuchMethod.html
@@ -0,0 +1,102 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the noSuchMethod method from the GenericClass class, for the Dart programming language.">
+  <title>noSuchMethod method - GenericClass class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/GenericClass-class.html">GenericClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
+    <li class="self-crumb">noSuchMethod method</li>
+  </ol>
+  <div class="self-name">noSuchMethod</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>GenericClass class</h5>
+    <ol>
+      <li class="section-title"><a href="fake/GenericClass-class.html#constructors">Constructors</a></li>
+      <li><a href="fake/GenericClass/GenericClass.html">GenericClass</a></li>
+    
+      <li class="section-title">
+        <a href="fake/GenericClass-class.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/GenericClass/member.html">member</a></li>
+      <li><a href="fake/GenericClass/overrideByBoth.html">overrideByBoth</a></li>
+      <li><a href="fake/GenericClass/overrideByEverything.html">overrideByEverything</a></li>
+      <li><a href="fake/GenericClass/overrideByGenericMixin.html">overrideByGenericMixin</a></li>
+      <li><a href="fake/GenericClass/overrideByModifierClass.html">overrideByModifierClass</a></li>
+      <li class="inherited"><a href="fake/GenericClass/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericClass-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/GenericClass/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericClass-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/GenericClass/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>noSuchMethod method</h1>
+
+    <section class="multi-line-signature">
+      <span class="returntype">dynamic</span>
+      <span class="name ">noSuchMethod</span>
+(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
+    </section>
+    
+    
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs_dev/fake/GenericClass/operator_equals.html b/testing/test_package_docs_dev/fake/GenericClass/operator_equals.html
new file mode 100644
index 0000000000..c1ce12e3c8
--- /dev/null
+++ b/testing/test_package_docs_dev/fake/GenericClass/operator_equals.html
@@ -0,0 +1,102 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the operator == method from the GenericClass class, for the Dart programming language.">
+  <title>operator == method - GenericClass class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/GenericClass-class.html">GenericClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
+    <li class="self-crumb">operator == method</li>
+  </ol>
+  <div class="self-name">operator ==</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>GenericClass class</h5>
+    <ol>
+      <li class="section-title"><a href="fake/GenericClass-class.html#constructors">Constructors</a></li>
+      <li><a href="fake/GenericClass/GenericClass.html">GenericClass</a></li>
+    
+      <li class="section-title">
+        <a href="fake/GenericClass-class.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/GenericClass/member.html">member</a></li>
+      <li><a href="fake/GenericClass/overrideByBoth.html">overrideByBoth</a></li>
+      <li><a href="fake/GenericClass/overrideByEverything.html">overrideByEverything</a></li>
+      <li><a href="fake/GenericClass/overrideByGenericMixin.html">overrideByGenericMixin</a></li>
+      <li><a href="fake/GenericClass/overrideByModifierClass.html">overrideByModifierClass</a></li>
+      <li class="inherited"><a href="fake/GenericClass/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericClass-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/GenericClass/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericClass-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/GenericClass/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>operator == method</h1>
+
+    <section class="multi-line-signature">
+      <span class="returntype">bool</span>
+      <span class="name ">operator ==</span>
+(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
+    </section>
+    
+    
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs_dev/fake/GenericClass/overrideByBoth.html b/testing/test_package_docs_dev/fake/GenericClass/overrideByBoth.html
new file mode 100644
index 0000000000..106986ef9f
--- /dev/null
+++ b/testing/test_package_docs_dev/fake/GenericClass/overrideByBoth.html
@@ -0,0 +1,104 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the overrideByBoth property from the GenericClass class, for the Dart programming language.">
+  <title>overrideByBoth property - GenericClass class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/GenericClass-class.html">GenericClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
+    <li class="self-crumb">overrideByBoth property</li>
+  </ol>
+  <div class="self-name">overrideByBoth</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>GenericClass class</h5>
+    <ol>
+      <li class="section-title"><a href="fake/GenericClass-class.html#constructors">Constructors</a></li>
+      <li><a href="fake/GenericClass/GenericClass.html">GenericClass</a></li>
+    
+      <li class="section-title">
+        <a href="fake/GenericClass-class.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/GenericClass/member.html">member</a></li>
+      <li><a href="fake/GenericClass/overrideByBoth.html">overrideByBoth</a></li>
+      <li><a href="fake/GenericClass/overrideByEverything.html">overrideByEverything</a></li>
+      <li><a href="fake/GenericClass/overrideByGenericMixin.html">overrideByGenericMixin</a></li>
+      <li><a href="fake/GenericClass/overrideByModifierClass.html">overrideByModifierClass</a></li>
+      <li class="inherited"><a href="fake/GenericClass/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericClass-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/GenericClass/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericClass-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/GenericClass/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>overrideByBoth property</h1>
+
+        <section class="multi-line-signature">
+          <span class="returntype">T</span>
+          <span class="name ">overrideByBoth</span>
+          <div class="features">read / write</div>
+        </section>
+        <section class="desc markdown">
+          <p>Destined to be overridden by <a href="fake/ModifierClass-class.html">ModifierClass</a> and <a href="fake/GenericMixin-mixin.html">GenericMixin</a>, both.</p>
+        </section>
+                
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs_dev/fake/GenericClass/overrideByEverything.html b/testing/test_package_docs_dev/fake/GenericClass/overrideByEverything.html
new file mode 100644
index 0000000000..a22518f730
--- /dev/null
+++ b/testing/test_package_docs_dev/fake/GenericClass/overrideByEverything.html
@@ -0,0 +1,104 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the overrideByEverything property from the GenericClass class, for the Dart programming language.">
+  <title>overrideByEverything property - GenericClass class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/GenericClass-class.html">GenericClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
+    <li class="self-crumb">overrideByEverything property</li>
+  </ol>
+  <div class="self-name">overrideByEverything</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>GenericClass class</h5>
+    <ol>
+      <li class="section-title"><a href="fake/GenericClass-class.html#constructors">Constructors</a></li>
+      <li><a href="fake/GenericClass/GenericClass.html">GenericClass</a></li>
+    
+      <li class="section-title">
+        <a href="fake/GenericClass-class.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/GenericClass/member.html">member</a></li>
+      <li><a href="fake/GenericClass/overrideByBoth.html">overrideByBoth</a></li>
+      <li><a href="fake/GenericClass/overrideByEverything.html">overrideByEverything</a></li>
+      <li><a href="fake/GenericClass/overrideByGenericMixin.html">overrideByGenericMixin</a></li>
+      <li><a href="fake/GenericClass/overrideByModifierClass.html">overrideByModifierClass</a></li>
+      <li class="inherited"><a href="fake/GenericClass/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericClass-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/GenericClass/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericClass-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/GenericClass/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>overrideByEverything property</h1>
+
+        <section class="multi-line-signature">
+          <span class="returntype">T</span>
+          <span class="name ">overrideByEverything</span>
+          <div class="features">read / write</div>
+        </section>
+        <section class="desc markdown">
+          <p>Destined to be overridden by everything.</p>
+        </section>
+                
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs_dev/fake/GenericClass/overrideByGenericMixin.html b/testing/test_package_docs_dev/fake/GenericClass/overrideByGenericMixin.html
new file mode 100644
index 0000000000..8258d2498b
--- /dev/null
+++ b/testing/test_package_docs_dev/fake/GenericClass/overrideByGenericMixin.html
@@ -0,0 +1,104 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the overrideByGenericMixin property from the GenericClass class, for the Dart programming language.">
+  <title>overrideByGenericMixin property - GenericClass class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/GenericClass-class.html">GenericClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
+    <li class="self-crumb">overrideByGenericMixin property</li>
+  </ol>
+  <div class="self-name">overrideByGenericMixin</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>GenericClass class</h5>
+    <ol>
+      <li class="section-title"><a href="fake/GenericClass-class.html#constructors">Constructors</a></li>
+      <li><a href="fake/GenericClass/GenericClass.html">GenericClass</a></li>
+    
+      <li class="section-title">
+        <a href="fake/GenericClass-class.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/GenericClass/member.html">member</a></li>
+      <li><a href="fake/GenericClass/overrideByBoth.html">overrideByBoth</a></li>
+      <li><a href="fake/GenericClass/overrideByEverything.html">overrideByEverything</a></li>
+      <li><a href="fake/GenericClass/overrideByGenericMixin.html">overrideByGenericMixin</a></li>
+      <li><a href="fake/GenericClass/overrideByModifierClass.html">overrideByModifierClass</a></li>
+      <li class="inherited"><a href="fake/GenericClass/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericClass-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/GenericClass/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericClass-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/GenericClass/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>overrideByGenericMixin property</h1>
+
+        <section class="multi-line-signature">
+          <span class="returntype">T</span>
+          <span class="name ">overrideByGenericMixin</span>
+          <div class="features">read / write</div>
+        </section>
+        <section class="desc markdown">
+          <p>Destined to be overridden by <a href="fake/GenericMixin-mixin.html">GenericMixin</a>.</p>
+        </section>
+                
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs_dev/fake/GenericClass/overrideByModifierClass.html b/testing/test_package_docs_dev/fake/GenericClass/overrideByModifierClass.html
new file mode 100644
index 0000000000..6753eb826f
--- /dev/null
+++ b/testing/test_package_docs_dev/fake/GenericClass/overrideByModifierClass.html
@@ -0,0 +1,104 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the overrideByModifierClass property from the GenericClass class, for the Dart programming language.">
+  <title>overrideByModifierClass property - GenericClass class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/GenericClass-class.html">GenericClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
+    <li class="self-crumb">overrideByModifierClass property</li>
+  </ol>
+  <div class="self-name">overrideByModifierClass</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>GenericClass class</h5>
+    <ol>
+      <li class="section-title"><a href="fake/GenericClass-class.html#constructors">Constructors</a></li>
+      <li><a href="fake/GenericClass/GenericClass.html">GenericClass</a></li>
+    
+      <li class="section-title">
+        <a href="fake/GenericClass-class.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/GenericClass/member.html">member</a></li>
+      <li><a href="fake/GenericClass/overrideByBoth.html">overrideByBoth</a></li>
+      <li><a href="fake/GenericClass/overrideByEverything.html">overrideByEverything</a></li>
+      <li><a href="fake/GenericClass/overrideByGenericMixin.html">overrideByGenericMixin</a></li>
+      <li><a href="fake/GenericClass/overrideByModifierClass.html">overrideByModifierClass</a></li>
+      <li class="inherited"><a href="fake/GenericClass/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericClass-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/GenericClass/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericClass-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/GenericClass/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>overrideByModifierClass property</h1>
+
+        <section class="multi-line-signature">
+          <span class="returntype">T</span>
+          <span class="name ">overrideByModifierClass</span>
+          <div class="features">read / write</div>
+        </section>
+        <section class="desc markdown">
+          <p>Destined to be overridden by <a href="fake/ModifierClass-class.html">ModifierClass</a>.</p>
+        </section>
+                
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs_dev/fake/GenericClass/runtimeType.html b/testing/test_package_docs_dev/fake/GenericClass/runtimeType.html
new file mode 100644
index 0000000000..255c9e22d5
--- /dev/null
+++ b/testing/test_package_docs_dev/fake/GenericClass/runtimeType.html
@@ -0,0 +1,106 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the runtimeType property from the GenericClass class, for the Dart programming language.">
+  <title>runtimeType property - GenericClass class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/GenericClass-class.html">GenericClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
+    <li class="self-crumb">runtimeType property</li>
+  </ol>
+  <div class="self-name">runtimeType</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>GenericClass class</h5>
+    <ol>
+      <li class="section-title"><a href="fake/GenericClass-class.html#constructors">Constructors</a></li>
+      <li><a href="fake/GenericClass/GenericClass.html">GenericClass</a></li>
+    
+      <li class="section-title">
+        <a href="fake/GenericClass-class.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/GenericClass/member.html">member</a></li>
+      <li><a href="fake/GenericClass/overrideByBoth.html">overrideByBoth</a></li>
+      <li><a href="fake/GenericClass/overrideByEverything.html">overrideByEverything</a></li>
+      <li><a href="fake/GenericClass/overrideByGenericMixin.html">overrideByGenericMixin</a></li>
+      <li><a href="fake/GenericClass/overrideByModifierClass.html">overrideByModifierClass</a></li>
+      <li class="inherited"><a href="fake/GenericClass/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericClass-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/GenericClass/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericClass-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/GenericClass/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>runtimeType property</h1>
+
+
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>
+  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs_dev/fake/GenericClass/toString.html b/testing/test_package_docs_dev/fake/GenericClass/toString.html
new file mode 100644
index 0000000000..6d9183380e
--- /dev/null
+++ b/testing/test_package_docs_dev/fake/GenericClass/toString.html
@@ -0,0 +1,102 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the toString method from the GenericClass class, for the Dart programming language.">
+  <title>toString method - GenericClass class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/GenericClass-class.html">GenericClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
+    <li class="self-crumb">toString method</li>
+  </ol>
+  <div class="self-name">toString</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>GenericClass class</h5>
+    <ol>
+      <li class="section-title"><a href="fake/GenericClass-class.html#constructors">Constructors</a></li>
+      <li><a href="fake/GenericClass/GenericClass.html">GenericClass</a></li>
+    
+      <li class="section-title">
+        <a href="fake/GenericClass-class.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/GenericClass/member.html">member</a></li>
+      <li><a href="fake/GenericClass/overrideByBoth.html">overrideByBoth</a></li>
+      <li><a href="fake/GenericClass/overrideByEverything.html">overrideByEverything</a></li>
+      <li><a href="fake/GenericClass/overrideByGenericMixin.html">overrideByGenericMixin</a></li>
+      <li><a href="fake/GenericClass/overrideByModifierClass.html">overrideByModifierClass</a></li>
+      <li class="inherited"><a href="fake/GenericClass/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericClass-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/GenericClass/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericClass-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/GenericClass/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>toString method</h1>
+
+    <section class="multi-line-signature">
+      <span class="returntype">String</span>
+      <span class="name ">toString</span>
+(<wbr>)
+    </section>
+    
+    
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs_dev/fake/GenericMixin-mixin.html b/testing/test_package_docs_dev/fake/GenericMixin-mixin.html
new file mode 100644
index 0000000000..abb3df2f53
--- /dev/null
+++ b/testing/test_package_docs_dev/fake/GenericMixin-mixin.html
@@ -0,0 +1,370 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the GenericMixin mixin from the fake library, for the Dart programming language.">
+  <title>GenericMixin mixin - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li class="self-crumb">GenericMixin<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span> mixin</li>
+  </ol>
+  <div class="self-name">GenericMixin</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>fake library</h5>
+    <ol>
+      <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
+      <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
+      <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
+      <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
+      <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
+      <li><a href="fake/Annotation-class.html">Annotation</a></li>
+      <li><a href="fake/AnotherInterface-class.html">AnotherInterface</a></li>
+      <li><a href="fake/ATypeTakingClass-class.html">ATypeTakingClass</a></li>
+      <li><a href="fake/ATypeTakingClassMixedIn-class.html">ATypeTakingClassMixedIn</a></li>
+      <li><a href="fake/BaseForDocComments-class.html">BaseForDocComments</a></li>
+      <li><a href="fake/BaseThingy-class.html">BaseThingy</a></li>
+      <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
+      <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
+      <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
+      <li><a href="fake/Cool-class.html">Cool</a></li>
+      <li><a href="fake/DocumentWithATable-class.html">DocumentWithATable</a></li>
+      <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
+      <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
+      <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
+      <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
+      <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
+      <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
+      <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
+      <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
+      <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
+      <li><a href="fake/ImplicitProperties-class.html">ImplicitProperties</a></li>
+      <li><a href="fake/InheritingClassOne-class.html">InheritingClassOne</a></li>
+      <li><a href="fake/InheritingClassTwo-class.html">InheritingClassTwo</a></li>
+      <li><a href="fake/Interface-class.html">Interface</a></li>
+      <li><a href="fake/LongFirstLine-class.html">LongFirstLine</a></li>
+      <li><a href="fake/MIEEBase-class.html">MIEEBase</a></li>
+      <li><a href="fake/MIEEMixin-class.html">MIEEMixin</a></li>
+      <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
+      <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
+      <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
+      <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
+      <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
+      <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
+      <li><a href="fake/ReferringClass-class.html">ReferringClass</a></li>
+      <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+      <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
+      <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
+      <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
+      <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
+      <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
+      <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
+      <li><a href="fake/CUSTOM_CLASS_PRIVATE-constant.html">CUSTOM_CLASS_PRIVATE</a></li>
+      <li><a class="deprecated" href="fake/DOWN-constant.html">DOWN</a></li>
+      <li><a href="fake/greatAnnotation-constant.html">greatAnnotation</a></li>
+      <li><a href="fake/greatestAnnotation-constant.html">greatestAnnotation</a></li>
+      <li><a href="fake/incorrectDocReference-constant.html">incorrectDocReference</a></li>
+      <li><a href="fake/myMap-constant.html">myMap</a></li>
+      <li><a href="fake/NAME_SINGLEUNDERSCORE-constant.html">NAME_SINGLEUNDERSCORE</a></li>
+      <li><a href="fake/NAME_WITH_TWO_UNDERSCORES-constant.html">NAME_WITH_TWO_UNDERSCORES</a></li>
+      <li><a href="fake/PI-constant.html">PI</a></li>
+      <li><a href="fake/required-constant.html">required</a></li>
+      <li><a href="fake/testingCodeSyntaxInOneLiners-constant.html">testingCodeSyntaxInOneLiners</a></li>
+      <li><a href="fake/UP-constant.html">UP</a></li>
+      <li><a href="fake/ZERO-constant.html">ZERO</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
+      <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
+      <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
+      <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
+      <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
+      <li><a href="fake/justGetter.html">justGetter</a></li>
+      <li><a href="fake/justSetter.html">justSetter</a></li>
+      <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
+      <li><a class="deprecated" href="fake/meaningOfLife.html">meaningOfLife</a></li>
+      <li><a href="fake/mustGetThis.html">mustGetThis</a></li>
+      <li><a href="fake/setAndGet.html">setAndGet</a></li>
+      <li><a href="fake/simpleProperty.html">simpleProperty</a></li>
+      <li><a href="fake/useSomethingInAnotherPackage.html">useSomethingInAnotherPackage</a></li>
+      <li><a href="fake/useSomethingInTheSdk.html">useSomethingInTheSdk</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#functions">Functions</a></li>
+      <li><a href="fake/addCallback.html">addCallback</a></li>
+      <li><a href="fake/addCallback2.html">addCallback2</a></li>
+      <li><a href="fake/aVoidParameter.html">aVoidParameter</a></li>
+      <li><a href="fake/functionWithFunctionParameters.html">functionWithFunctionParameters</a></li>
+      <li><a href="fake/myGenericFunction.html">myGenericFunction</a></li>
+      <li><a href="fake/onlyPositionalWithNoDefaultNoType.html">onlyPositionalWithNoDefaultNoType</a></li>
+      <li><a href="fake/paintImage1.html">paintImage1</a></li>
+      <li><a href="fake/paintImage2.html">paintImage2</a></li>
+      <li><a href="fake/paramFromAnotherLib.html">paramFromAnotherLib</a></li>
+      <li><a href="fake/paramOfFutureOrNull.html">paramOfFutureOrNull</a></li>
+      <li><a href="fake/returningFutureVoid.html">returningFutureVoid</a></li>
+      <li><a href="fake/short.html">short</a></li>
+      <li><a href="fake/soIntense.html">soIntense</a></li>
+      <li><a href="fake/thisIsAlsoAsync.html">thisIsAlsoAsync</a></li>
+      <li><a href="fake/thisIsAsync.html">thisIsAsync</a></li>
+      <li><a href="fake/thisIsFutureOr.html">thisIsFutureOr</a></li>
+      <li><a href="fake/thisIsFutureOrNull.html">thisIsFutureOrNull</a></li>
+      <li><a href="fake/thisIsFutureOrT.html">thisIsFutureOrT</a></li>
+      <li><a class="deprecated" href="fake/topLevelFunction.html">topLevelFunction</a></li>
+      <li><a href="fake/typeParamOfFutureOr.html">typeParamOfFutureOr</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#enums">Enums</a></li>
+      <li><a href="fake/Color-class.html">Color</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#typedefs">Typedefs</a></li>
+      <li><a href="fake/Callback2.html">Callback2</a></li>
+      <li><a class="deprecated" href="fake/FakeProcesses.html">FakeProcesses</a></li>
+      <li><a href="fake/GenericTypedef.html">GenericTypedef</a></li>
+      <li><a href="fake/LotsAndLotsOfParameters.html">LotsAndLotsOfParameters</a></li>
+      <li><a href="fake/myCoolTypedef.html">myCoolTypedef</a></li>
+      <li><a href="fake/NewGenericTypedef.html">NewGenericTypedef</a></li>
+      <li><a href="fake/VoidCallback.html">VoidCallback</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#exceptions">Exceptions</a></li>
+      <li><a class="deprecated" href="fake/Doh-class.html">Doh</a></li>
+      <li><a href="fake/Oops-class.html">Oops</a></li>
+    </ol>
+  </div>
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+      <h1>GenericMixin&lt;<wbr><span class="type-parameter">T</span>&gt; mixin </h1>
+
+    <section class="desc markdown">
+      <p>A generic mixin that requires GenericClass as a superclass.</p>
+    </section>
+    
+    <section>
+      <dl class="dl-horizontal">
+        <dt>Superclass Constraints</dt>
+        <dd><ul class="comma-separated dark mixin-relationships">
+          <li><a href="fake/GenericClass-class.html">GenericClass</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></li>
+        </ul></dd>
+
+
+
+
+        <dt>Implemented by</dt>
+        <dd><ul class="comma-separated mixin-relationships">
+          <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
+        </ul></dd>
+
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor" id="constructors">
+      <h2>Constructors</h2>
+
+      <dl class="constructor-summary-list">
+        <dt id="GenericMixin" class="callable">
+          <span class="name"><a href="fake/GenericMixin/GenericMixin.html">GenericMixin</a></span><span class="signature">()</span>
+        </dt>
+        <dd>
+          
+        </dd>
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor" id="instance-properties">
+      <h2>Properties</h2>
+
+      <dl class="properties">
+        <dt id="mixinMember" class="property">
+          <span class="name"><a href="fake/GenericMixin/mixinMember.html">mixinMember</a></span>
+          <span class="signature">&#8596; T</span> 
+        </dt>
+        <dd>
+          
+          <div class="features">read / write</div>
+</dd>
+        <dt id="overrideByBoth" class="property">
+          <span class="name"><a href="fake/GenericMixin/overrideByBoth.html">overrideByBoth</a></span>
+          <span class="signature">&#8596; T</span> 
+        </dt>
+        <dd>
+          Destined to be overridden by <a href="fake/ModifierClass-class.html">ModifierClass</a> and <a href="fake/GenericMixin-mixin.html">GenericMixin</a>, both.
+          <div class="features">read / write</div>
+</dd>
+        <dt id="overrideByEverything" class="property">
+          <span class="name"><a href="fake/GenericMixin/overrideByEverything.html">overrideByEverything</a></span>
+          <span class="signature">&#8596; T</span> 
+        </dt>
+        <dd>
+          Destined to be overridden by everything.
+          <div class="features">read / write</div>
+</dd>
+        <dt id="overrideByGenericMixin" class="property">
+          <span class="name"><a href="fake/GenericMixin/overrideByGenericMixin.html">overrideByGenericMixin</a></span>
+          <span class="signature">&#8596; T</span> 
+        </dt>
+        <dd>
+          Destined to be overridden by <a href="fake/GenericMixin-mixin.html">GenericMixin</a>.
+          <div class="features">read / write</div>
+</dd>
+        <dt id="hashCode" class="property inherited">
+          <span class="name"><a href="fake/GenericClass/hashCode.html">hashCode</a></span>
+          <span class="signature">&#8594; int</span> 
+        </dt>
+        <dd class="inherited">
+          
+          <div class="features">read-only, inherited</div>
+</dd>
+        <dt id="member" class="property inherited">
+          <span class="name"><a href="fake/GenericClass/member.html">member</a></span>
+          <span class="signature">&#8596; T</span> 
+        </dt>
+        <dd class="inherited">
+          
+          <div class="features">read / write, inherited</div>
+</dd>
+        <dt id="overrideByModifierClass" class="property inherited">
+          <span class="name"><a href="fake/GenericClass/overrideByModifierClass.html">overrideByModifierClass</a></span>
+          <span class="signature">&#8596; T</span> 
+        </dt>
+        <dd class="inherited">
+          Destined to be overridden by <a href="fake/ModifierClass-class.html">ModifierClass</a>.
+          <div class="features">read / write, inherited</div>
+</dd>
+        <dt id="runtimeType" class="property inherited">
+          <span class="name"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></span>
+          <span class="signature">&#8594; Type</span> 
+        </dt>
+        <dd class="inherited">
+          
+          <div class="features">read-only, inherited</div>
+</dd>
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor inherited" id="instance-methods">
+      <h2>Methods</h2>
+      <dl class="callables">
+        <dt id="noSuchMethod" class="callable inherited">
+          <span class="name"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
+            <span class="returntype parameter">&#8594; dynamic</span>
+          </span>
+          </dt>
+        <dd class="inherited">
+          
+          <div class="features">inherited</div>
+</dd>
+        <dt id="toString" class="callable inherited">
+          <span class="name"><a href="fake/GenericClass/toString.html">toString</a></span><span class="signature">(<wbr>)
+            <span class="returntype parameter">&#8594; String</span>
+          </span>
+          </dt>
+        <dd class="inherited">
+          
+          <div class="features">inherited</div>
+</dd>
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor inherited" id="operators">
+      <h2>Operators</h2>
+      <dl class="callables">
+        <dt id="operator ==" class="callable inherited">
+          <span class="name"><a href="fake/GenericClass/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
+            <span class="returntype parameter">&#8594; bool</span>
+          </span>
+          </dt>
+        <dd class="inherited">
+          
+          <div class="features">inherited</div>
+</dd>
+      </dl>
+    </section>
+
+
+
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+    <ol>
+      <li class="section-title"><a href="fake/GenericMixin-mixin.html#constructors">Constructors</a></li>
+      <li><a href="fake/GenericMixin/GenericMixin.html">GenericMixin</a></li>
+    
+      <li class="section-title">
+        <a href="fake/GenericMixin-mixin.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/GenericMixin/mixinMember.html">mixinMember</a></li>
+      <li><a href="fake/GenericMixin/overrideByBoth.html">overrideByBoth</a></li>
+      <li><a href="fake/GenericMixin/overrideByEverything.html">overrideByEverything</a></li>
+      <li><a href="fake/GenericMixin/overrideByGenericMixin.html">overrideByGenericMixin</a></li>
+      <li class="inherited"><a href="fake/GenericClass/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/GenericClass/member.html">member</a></li>
+      <li class="inherited"><a href="fake/GenericClass/overrideByModifierClass.html">overrideByModifierClass</a></li>
+      <li class="inherited"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericMixin-mixin.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/GenericClass/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericMixin-mixin.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/GenericClass/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs_dev/fake/GenericMixin/GenericMixin.html b/testing/test_package_docs_dev/fake/GenericMixin/GenericMixin.html
new file mode 100644
index 0000000000..eb946127f2
--- /dev/null
+++ b/testing/test_package_docs_dev/fake/GenericMixin/GenericMixin.html
@@ -0,0 +1,103 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the GenericMixin constructor from the Mixin GenericMixin class from the fake library, for the Dart programming language.">
+  <title>GenericMixin constructor - GenericMixin class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/GenericMixin-mixin.html">GenericMixin<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
+    <li class="self-crumb">GenericMixin constructor</li>
+  </ol>
+  <div class="self-name">GenericMixin</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>GenericMixin mixin</h5>
+    <ol>
+      <li class="section-title"><a href="fake/GenericMixin-mixin.html#constructors">Constructors</a></li>
+      <li><a href="fake/GenericMixin/GenericMixin.html">GenericMixin</a></li>
+    
+      <li class="section-title">
+        <a href="fake/GenericMixin-mixin.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/GenericMixin/mixinMember.html">mixinMember</a></li>
+      <li><a href="fake/GenericMixin/overrideByBoth.html">overrideByBoth</a></li>
+      <li><a href="fake/GenericMixin/overrideByEverything.html">overrideByEverything</a></li>
+      <li><a href="fake/GenericMixin/overrideByGenericMixin.html">overrideByGenericMixin</a></li>
+      <li class="inherited"><a href="fake/GenericClass/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/GenericClass/member.html">member</a></li>
+      <li class="inherited"><a href="fake/GenericClass/overrideByModifierClass.html">overrideByModifierClass</a></li>
+      <li class="inherited"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericMixin-mixin.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/GenericClass/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericMixin-mixin.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/GenericClass/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-left-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>GenericMixin&lt;<wbr><span class="type-parameter">T</span>&gt; constructor</h1>
+
+    <section class="multi-line-signature">
+      
+      <span class="name ">GenericMixin&lt;<wbr><span class="type-parameter">T</span>&gt;</span>(<wbr>)
+    </section>
+
+    
+    
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs_dev/fake/GenericMixin/mixinMember.html b/testing/test_package_docs_dev/fake/GenericMixin/mixinMember.html
new file mode 100644
index 0000000000..fdbcb5a786
--- /dev/null
+++ b/testing/test_package_docs_dev/fake/GenericMixin/mixinMember.html
@@ -0,0 +1,102 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the mixinMember property from the GenericMixin class, for the Dart programming language.">
+  <title>mixinMember property - GenericMixin class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/GenericMixin-mixin.html">GenericMixin<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
+    <li class="self-crumb">mixinMember property</li>
+  </ol>
+  <div class="self-name">mixinMember</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>GenericMixin mixin</h5>
+    <ol>
+      <li class="section-title"><a href="fake/GenericMixin-mixin.html#constructors">Constructors</a></li>
+      <li><a href="fake/GenericMixin/GenericMixin.html">GenericMixin</a></li>
+    
+      <li class="section-title">
+        <a href="fake/GenericMixin-mixin.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/GenericMixin/mixinMember.html">mixinMember</a></li>
+      <li><a href="fake/GenericMixin/overrideByBoth.html">overrideByBoth</a></li>
+      <li><a href="fake/GenericMixin/overrideByEverything.html">overrideByEverything</a></li>
+      <li><a href="fake/GenericMixin/overrideByGenericMixin.html">overrideByGenericMixin</a></li>
+      <li class="inherited"><a href="fake/GenericClass/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/GenericClass/member.html">member</a></li>
+      <li class="inherited"><a href="fake/GenericClass/overrideByModifierClass.html">overrideByModifierClass</a></li>
+      <li class="inherited"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericMixin-mixin.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/GenericClass/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericMixin-mixin.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/GenericClass/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>mixinMember property</h1>
+
+        <section class="multi-line-signature">
+          <span class="returntype">T</span>
+          <span class="name ">mixinMember</span>
+          <div class="features">read / write</div>
+        </section>
+                
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs_dev/fake/GenericMixin/overrideByBoth.html b/testing/test_package_docs_dev/fake/GenericMixin/overrideByBoth.html
new file mode 100644
index 0000000000..5560705dd7
--- /dev/null
+++ b/testing/test_package_docs_dev/fake/GenericMixin/overrideByBoth.html
@@ -0,0 +1,105 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the overrideByBoth property from the GenericMixin class, for the Dart programming language.">
+  <title>overrideByBoth property - GenericMixin class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/GenericMixin-mixin.html">GenericMixin<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
+    <li class="self-crumb">overrideByBoth property</li>
+  </ol>
+  <div class="self-name">overrideByBoth</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>GenericMixin mixin</h5>
+    <ol>
+      <li class="section-title"><a href="fake/GenericMixin-mixin.html#constructors">Constructors</a></li>
+      <li><a href="fake/GenericMixin/GenericMixin.html">GenericMixin</a></li>
+    
+      <li class="section-title">
+        <a href="fake/GenericMixin-mixin.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/GenericMixin/mixinMember.html">mixinMember</a></li>
+      <li><a href="fake/GenericMixin/overrideByBoth.html">overrideByBoth</a></li>
+      <li><a href="fake/GenericMixin/overrideByEverything.html">overrideByEverything</a></li>
+      <li><a href="fake/GenericMixin/overrideByGenericMixin.html">overrideByGenericMixin</a></li>
+      <li class="inherited"><a href="fake/GenericClass/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/GenericClass/member.html">member</a></li>
+      <li class="inherited"><a href="fake/GenericClass/overrideByModifierClass.html">overrideByModifierClass</a></li>
+      <li class="inherited"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericMixin-mixin.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/GenericClass/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericMixin-mixin.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/GenericClass/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>overrideByBoth property</h1>
+
+        <section class="multi-line-signature">
+          <span class="returntype">T</span>
+          <span class="name ">overrideByBoth</span>
+          <div class="features">read / write</div>
+        </section>
+        <section class="desc markdown">
+          <p>Destined to be overridden by <a href="fake/ModifierClass-class.html">ModifierClass</a> and <a href="fake/GenericMixin-mixin.html">GenericMixin</a>, both.</p>
+        </section>
+                
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs_dev/fake/GenericMixin/overrideByEverything.html b/testing/test_package_docs_dev/fake/GenericMixin/overrideByEverything.html
new file mode 100644
index 0000000000..78caaecef1
--- /dev/null
+++ b/testing/test_package_docs_dev/fake/GenericMixin/overrideByEverything.html
@@ -0,0 +1,105 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the overrideByEverything property from the GenericMixin class, for the Dart programming language.">
+  <title>overrideByEverything property - GenericMixin class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/GenericMixin-mixin.html">GenericMixin<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
+    <li class="self-crumb">overrideByEverything property</li>
+  </ol>
+  <div class="self-name">overrideByEverything</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>GenericMixin mixin</h5>
+    <ol>
+      <li class="section-title"><a href="fake/GenericMixin-mixin.html#constructors">Constructors</a></li>
+      <li><a href="fake/GenericMixin/GenericMixin.html">GenericMixin</a></li>
+    
+      <li class="section-title">
+        <a href="fake/GenericMixin-mixin.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/GenericMixin/mixinMember.html">mixinMember</a></li>
+      <li><a href="fake/GenericMixin/overrideByBoth.html">overrideByBoth</a></li>
+      <li><a href="fake/GenericMixin/overrideByEverything.html">overrideByEverything</a></li>
+      <li><a href="fake/GenericMixin/overrideByGenericMixin.html">overrideByGenericMixin</a></li>
+      <li class="inherited"><a href="fake/GenericClass/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/GenericClass/member.html">member</a></li>
+      <li class="inherited"><a href="fake/GenericClass/overrideByModifierClass.html">overrideByModifierClass</a></li>
+      <li class="inherited"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericMixin-mixin.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/GenericClass/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericMixin-mixin.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/GenericClass/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>overrideByEverything property</h1>
+
+        <section class="multi-line-signature">
+          <span class="returntype">T</span>
+          <span class="name ">overrideByEverything</span>
+          <div class="features">read / write</div>
+        </section>
+        <section class="desc markdown">
+          <p>Destined to be overridden by everything.</p>
+        </section>
+                
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs_dev/fake/GenericMixin/overrideByGenericMixin.html b/testing/test_package_docs_dev/fake/GenericMixin/overrideByGenericMixin.html
new file mode 100644
index 0000000000..b3edae35f6
--- /dev/null
+++ b/testing/test_package_docs_dev/fake/GenericMixin/overrideByGenericMixin.html
@@ -0,0 +1,105 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the overrideByGenericMixin property from the GenericMixin class, for the Dart programming language.">
+  <title>overrideByGenericMixin property - GenericMixin class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/GenericMixin-mixin.html">GenericMixin<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
+    <li class="self-crumb">overrideByGenericMixin property</li>
+  </ol>
+  <div class="self-name">overrideByGenericMixin</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>GenericMixin mixin</h5>
+    <ol>
+      <li class="section-title"><a href="fake/GenericMixin-mixin.html#constructors">Constructors</a></li>
+      <li><a href="fake/GenericMixin/GenericMixin.html">GenericMixin</a></li>
+    
+      <li class="section-title">
+        <a href="fake/GenericMixin-mixin.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/GenericMixin/mixinMember.html">mixinMember</a></li>
+      <li><a href="fake/GenericMixin/overrideByBoth.html">overrideByBoth</a></li>
+      <li><a href="fake/GenericMixin/overrideByEverything.html">overrideByEverything</a></li>
+      <li><a href="fake/GenericMixin/overrideByGenericMixin.html">overrideByGenericMixin</a></li>
+      <li class="inherited"><a href="fake/GenericClass/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/GenericClass/member.html">member</a></li>
+      <li class="inherited"><a href="fake/GenericClass/overrideByModifierClass.html">overrideByModifierClass</a></li>
+      <li class="inherited"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericMixin-mixin.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/GenericClass/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/GenericMixin-mixin.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/GenericClass/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>overrideByGenericMixin property</h1>
+
+        <section class="multi-line-signature">
+          <span class="returntype">T</span>
+          <span class="name ">overrideByGenericMixin</span>
+          <div class="features">read / write</div>
+        </section>
+        <section class="desc markdown">
+          <p>Destined to be overridden by <a href="fake/GenericMixin-mixin.html">GenericMixin</a>.</p>
+        </section>
+                
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs_dev/fake/GenericTypedef.html b/testing/test_package_docs_dev/fake/GenericTypedef.html
index 5b39c51ff3..a6e35b344c 100644
--- a/testing/test_package_docs_dev/fake/GenericTypedef.html
+++ b/testing/test_package_docs_dev/fake/GenericTypedef.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/HasGenericWithExtends-class.html b/testing/test_package_docs_dev/fake/HasGenericWithExtends-class.html
index a79991cc6d..2557289446 100644
--- a/testing/test_package_docs_dev/fake/HasGenericWithExtends-class.html
+++ b/testing/test_package_docs_dev/fake/HasGenericWithExtends-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/HasGenerics-class.html b/testing/test_package_docs_dev/fake/HasGenerics-class.html
index fe4ed37a75..a5140bc22b 100644
--- a/testing/test_package_docs_dev/fake/HasGenerics-class.html
+++ b/testing/test_package_docs_dev/fake/HasGenerics-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/HasPragma-class.html b/testing/test_package_docs_dev/fake/HasPragma-class.html
index fcf7b10441..b4c50d46a4 100644
--- a/testing/test_package_docs_dev/fake/HasPragma-class.html
+++ b/testing/test_package_docs_dev/fake/HasPragma-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/ImplementingThingy-class.html b/testing/test_package_docs_dev/fake/ImplementingThingy-class.html
index 98652ddab6..3dce7a95c2 100644
--- a/testing/test_package_docs_dev/fake/ImplementingThingy-class.html
+++ b/testing/test_package_docs_dev/fake/ImplementingThingy-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/ImplementingThingy2-class.html b/testing/test_package_docs_dev/fake/ImplementingThingy2-class.html
index a75094a54e..3e6fbccec7 100644
--- a/testing/test_package_docs_dev/fake/ImplementingThingy2-class.html
+++ b/testing/test_package_docs_dev/fake/ImplementingThingy2-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/ImplementsFutureVoid-class.html b/testing/test_package_docs_dev/fake/ImplementsFutureVoid-class.html
index 85acb3e573..5d9c8ad88a 100644
--- a/testing/test_package_docs_dev/fake/ImplementsFutureVoid-class.html
+++ b/testing/test_package_docs_dev/fake/ImplementsFutureVoid-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/ImplicitProperties-class.html b/testing/test_package_docs_dev/fake/ImplicitProperties-class.html
index 806d2f60c8..a3ac385fdc 100644
--- a/testing/test_package_docs_dev/fake/ImplicitProperties-class.html
+++ b/testing/test_package_docs_dev/fake/ImplicitProperties-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/InheritingClassOne-class.html b/testing/test_package_docs_dev/fake/InheritingClassOne-class.html
index 2583699db9..cf83e404e9 100644
--- a/testing/test_package_docs_dev/fake/InheritingClassOne-class.html
+++ b/testing/test_package_docs_dev/fake/InheritingClassOne-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/InheritingClassTwo-class.html b/testing/test_package_docs_dev/fake/InheritingClassTwo-class.html
index 1fa0111ce7..ebc0c47ea4 100644
--- a/testing/test_package_docs_dev/fake/InheritingClassTwo-class.html
+++ b/testing/test_package_docs_dev/fake/InheritingClassTwo-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/Interface-class.html b/testing/test_package_docs_dev/fake/Interface-class.html
index 7fcaa5304c..d11a4ff5f2 100644
--- a/testing/test_package_docs_dev/fake/Interface-class.html
+++ b/testing/test_package_docs_dev/fake/Interface-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/LongFirstLine-class.html b/testing/test_package_docs_dev/fake/LongFirstLine-class.html
index 4de0826bcb..3e30eab3ce 100644
--- a/testing/test_package_docs_dev/fake/LongFirstLine-class.html
+++ b/testing/test_package_docs_dev/fake/LongFirstLine-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/LotsAndLotsOfParameters.html b/testing/test_package_docs_dev/fake/LotsAndLotsOfParameters.html
index dddb5b0ce1..9445343a41 100644
--- a/testing/test_package_docs_dev/fake/LotsAndLotsOfParameters.html
+++ b/testing/test_package_docs_dev/fake/LotsAndLotsOfParameters.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/MIEEBase-class.html b/testing/test_package_docs_dev/fake/MIEEBase-class.html
index 5fe558c375..9b52aeccbe 100644
--- a/testing/test_package_docs_dev/fake/MIEEBase-class.html
+++ b/testing/test_package_docs_dev/fake/MIEEBase-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/MIEEMixin-class.html b/testing/test_package_docs_dev/fake/MIEEMixin-class.html
index eea2818754..af6d1b15e5 100644
--- a/testing/test_package_docs_dev/fake/MIEEMixin-class.html
+++ b/testing/test_package_docs_dev/fake/MIEEMixin-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/MIEEMixinWithOverride-class.html b/testing/test_package_docs_dev/fake/MIEEMixinWithOverride-class.html
index 7362677556..0ec671a3f7 100644
--- a/testing/test_package_docs_dev/fake/MIEEMixinWithOverride-class.html
+++ b/testing/test_package_docs_dev/fake/MIEEMixinWithOverride-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/MIEEThing-class.html b/testing/test_package_docs_dev/fake/MIEEThing-class.html
index 8c095c63ae..f7cdf0f9a2 100644
--- a/testing/test_package_docs_dev/fake/MIEEThing-class.html
+++ b/testing/test_package_docs_dev/fake/MIEEThing-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/MixMeIn-class.html b/testing/test_package_docs_dev/fake/MixMeIn-class.html
index 1d32b31799..bbd79206f4 100644
--- a/testing/test_package_docs_dev/fake/MixMeIn-class.html
+++ b/testing/test_package_docs_dev/fake/MixMeIn-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/ModifierClass-class.html b/testing/test_package_docs_dev/fake/ModifierClass-class.html
new file mode 100644
index 0000000000..acee2158db
--- /dev/null
+++ b/testing/test_package_docs_dev/fake/ModifierClass-class.html
@@ -0,0 +1,371 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the ModifierClass class from the fake library, for the Dart programming language.">
+  <title>ModifierClass class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li class="self-crumb">ModifierClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span> class</li>
+  </ol>
+  <div class="self-name">ModifierClass</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>fake library</h5>
+    <ol>
+      <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
+      <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
+      <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
+      <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
+      <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
+      <li><a href="fake/Annotation-class.html">Annotation</a></li>
+      <li><a href="fake/AnotherInterface-class.html">AnotherInterface</a></li>
+      <li><a href="fake/ATypeTakingClass-class.html">ATypeTakingClass</a></li>
+      <li><a href="fake/ATypeTakingClassMixedIn-class.html">ATypeTakingClassMixedIn</a></li>
+      <li><a href="fake/BaseForDocComments-class.html">BaseForDocComments</a></li>
+      <li><a href="fake/BaseThingy-class.html">BaseThingy</a></li>
+      <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
+      <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
+      <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
+      <li><a href="fake/Cool-class.html">Cool</a></li>
+      <li><a href="fake/DocumentWithATable-class.html">DocumentWithATable</a></li>
+      <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
+      <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
+      <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
+      <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
+      <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
+      <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
+      <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
+      <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
+      <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
+      <li><a href="fake/ImplicitProperties-class.html">ImplicitProperties</a></li>
+      <li><a href="fake/InheritingClassOne-class.html">InheritingClassOne</a></li>
+      <li><a href="fake/InheritingClassTwo-class.html">InheritingClassTwo</a></li>
+      <li><a href="fake/Interface-class.html">Interface</a></li>
+      <li><a href="fake/LongFirstLine-class.html">LongFirstLine</a></li>
+      <li><a href="fake/MIEEBase-class.html">MIEEBase</a></li>
+      <li><a href="fake/MIEEMixin-class.html">MIEEMixin</a></li>
+      <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
+      <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
+      <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
+      <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
+      <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
+      <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
+      <li><a href="fake/ReferringClass-class.html">ReferringClass</a></li>
+      <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+      <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
+      <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
+      <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
+      <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
+      <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
+      <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
+      <li><a href="fake/CUSTOM_CLASS_PRIVATE-constant.html">CUSTOM_CLASS_PRIVATE</a></li>
+      <li><a class="deprecated" href="fake/DOWN-constant.html">DOWN</a></li>
+      <li><a href="fake/greatAnnotation-constant.html">greatAnnotation</a></li>
+      <li><a href="fake/greatestAnnotation-constant.html">greatestAnnotation</a></li>
+      <li><a href="fake/incorrectDocReference-constant.html">incorrectDocReference</a></li>
+      <li><a href="fake/myMap-constant.html">myMap</a></li>
+      <li><a href="fake/NAME_SINGLEUNDERSCORE-constant.html">NAME_SINGLEUNDERSCORE</a></li>
+      <li><a href="fake/NAME_WITH_TWO_UNDERSCORES-constant.html">NAME_WITH_TWO_UNDERSCORES</a></li>
+      <li><a href="fake/PI-constant.html">PI</a></li>
+      <li><a href="fake/required-constant.html">required</a></li>
+      <li><a href="fake/testingCodeSyntaxInOneLiners-constant.html">testingCodeSyntaxInOneLiners</a></li>
+      <li><a href="fake/UP-constant.html">UP</a></li>
+      <li><a href="fake/ZERO-constant.html">ZERO</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
+      <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
+      <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
+      <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
+      <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
+      <li><a href="fake/justGetter.html">justGetter</a></li>
+      <li><a href="fake/justSetter.html">justSetter</a></li>
+      <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
+      <li><a class="deprecated" href="fake/meaningOfLife.html">meaningOfLife</a></li>
+      <li><a href="fake/mustGetThis.html">mustGetThis</a></li>
+      <li><a href="fake/setAndGet.html">setAndGet</a></li>
+      <li><a href="fake/simpleProperty.html">simpleProperty</a></li>
+      <li><a href="fake/useSomethingInAnotherPackage.html">useSomethingInAnotherPackage</a></li>
+      <li><a href="fake/useSomethingInTheSdk.html">useSomethingInTheSdk</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#functions">Functions</a></li>
+      <li><a href="fake/addCallback.html">addCallback</a></li>
+      <li><a href="fake/addCallback2.html">addCallback2</a></li>
+      <li><a href="fake/aVoidParameter.html">aVoidParameter</a></li>
+      <li><a href="fake/functionWithFunctionParameters.html">functionWithFunctionParameters</a></li>
+      <li><a href="fake/myGenericFunction.html">myGenericFunction</a></li>
+      <li><a href="fake/onlyPositionalWithNoDefaultNoType.html">onlyPositionalWithNoDefaultNoType</a></li>
+      <li><a href="fake/paintImage1.html">paintImage1</a></li>
+      <li><a href="fake/paintImage2.html">paintImage2</a></li>
+      <li><a href="fake/paramFromAnotherLib.html">paramFromAnotherLib</a></li>
+      <li><a href="fake/paramOfFutureOrNull.html">paramOfFutureOrNull</a></li>
+      <li><a href="fake/returningFutureVoid.html">returningFutureVoid</a></li>
+      <li><a href="fake/short.html">short</a></li>
+      <li><a href="fake/soIntense.html">soIntense</a></li>
+      <li><a href="fake/thisIsAlsoAsync.html">thisIsAlsoAsync</a></li>
+      <li><a href="fake/thisIsAsync.html">thisIsAsync</a></li>
+      <li><a href="fake/thisIsFutureOr.html">thisIsFutureOr</a></li>
+      <li><a href="fake/thisIsFutureOrNull.html">thisIsFutureOrNull</a></li>
+      <li><a href="fake/thisIsFutureOrT.html">thisIsFutureOrT</a></li>
+      <li><a class="deprecated" href="fake/topLevelFunction.html">topLevelFunction</a></li>
+      <li><a href="fake/typeParamOfFutureOr.html">typeParamOfFutureOr</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#enums">Enums</a></li>
+      <li><a href="fake/Color-class.html">Color</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#typedefs">Typedefs</a></li>
+      <li><a href="fake/Callback2.html">Callback2</a></li>
+      <li><a class="deprecated" href="fake/FakeProcesses.html">FakeProcesses</a></li>
+      <li><a href="fake/GenericTypedef.html">GenericTypedef</a></li>
+      <li><a href="fake/LotsAndLotsOfParameters.html">LotsAndLotsOfParameters</a></li>
+      <li><a href="fake/myCoolTypedef.html">myCoolTypedef</a></li>
+      <li><a href="fake/NewGenericTypedef.html">NewGenericTypedef</a></li>
+      <li><a href="fake/VoidCallback.html">VoidCallback</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#exceptions">Exceptions</a></li>
+      <li><a class="deprecated" href="fake/Doh-class.html">Doh</a></li>
+      <li><a href="fake/Oops-class.html">Oops</a></li>
+    </ol>
+  </div>
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+      <h1>ModifierClass&lt;<wbr><span class="type-parameter">T</span>&gt; class </h1>
+
+    <section class="desc markdown">
+      <p>A class extending a generic class.</p>
+    </section>
+    
+    <section>
+      <dl class="dl-horizontal">
+        <dt>Inheritance</dt>
+        <dd><ul class="gt-separated dark clazz-relationships">
+          <li>Object</li>
+          <li><a href="fake/GenericClass-class.html">GenericClass</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></li>
+          <li>ModifierClass</li>
+        </ul></dd>
+
+
+
+        <dt>Implementers</dt>
+        <dd><ul class="comma-separated clazz-relationships">
+          <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
+        </ul></dd>
+
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor" id="constructors">
+      <h2>Constructors</h2>
+
+      <dl class="constructor-summary-list">
+        <dt id="ModifierClass" class="callable">
+          <span class="name"><a href="fake/ModifierClass/ModifierClass.html">ModifierClass</a></span><span class="signature">()</span>
+        </dt>
+        <dd>
+          
+        </dd>
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor" id="instance-properties">
+      <h2>Properties</h2>
+
+      <dl class="properties">
+        <dt id="modifierMember" class="property">
+          <span class="name"><a href="fake/ModifierClass/modifierMember.html">modifierMember</a></span>
+          <span class="signature">&#8596; T</span> 
+        </dt>
+        <dd>
+          
+          <div class="features">read / write</div>
+</dd>
+        <dt id="overrideByBoth" class="property">
+          <span class="name"><a href="fake/ModifierClass/overrideByBoth.html">overrideByBoth</a></span>
+          <span class="signature">&#8596; T</span> 
+        </dt>
+        <dd>
+          Destined to be overridden by <a href="fake/ModifierClass-class.html">ModifierClass</a> and <a href="fake/GenericMixin-mixin.html">GenericMixin</a>, both.
+          <div class="features">read / write</div>
+</dd>
+        <dt id="overrideByEverything" class="property">
+          <span class="name"><a href="fake/ModifierClass/overrideByEverything.html">overrideByEverything</a></span>
+          <span class="signature">&#8596; T</span> 
+        </dt>
+        <dd>
+          Destined to be overridden by everything.
+          <div class="features">read / write</div>
+</dd>
+        <dt id="overrideByModifierClass" class="property">
+          <span class="name"><a href="fake/ModifierClass/overrideByModifierClass.html">overrideByModifierClass</a></span>
+          <span class="signature">&#8596; T</span> 
+        </dt>
+        <dd>
+          Destined to be overridden by <a href="fake/ModifierClass-class.html">ModifierClass</a>.
+          <div class="features">read / write</div>
+</dd>
+        <dt id="hashCode" class="property inherited">
+          <span class="name"><a href="fake/GenericClass/hashCode.html">hashCode</a></span>
+          <span class="signature">&#8594; int</span> 
+        </dt>
+        <dd class="inherited">
+          
+          <div class="features">read-only, inherited</div>
+</dd>
+        <dt id="member" class="property inherited">
+          <span class="name"><a href="fake/GenericClass/member.html">member</a></span>
+          <span class="signature">&#8596; T</span> 
+        </dt>
+        <dd class="inherited">
+          
+          <div class="features">read / write, inherited</div>
+</dd>
+        <dt id="overrideByGenericMixin" class="property inherited">
+          <span class="name"><a href="fake/GenericClass/overrideByGenericMixin.html">overrideByGenericMixin</a></span>
+          <span class="signature">&#8596; T</span> 
+        </dt>
+        <dd class="inherited">
+          Destined to be overridden by <a href="fake/GenericMixin-mixin.html">GenericMixin</a>.
+          <div class="features">read / write, inherited</div>
+</dd>
+        <dt id="runtimeType" class="property inherited">
+          <span class="name"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></span>
+          <span class="signature">&#8594; Type</span> 
+        </dt>
+        <dd class="inherited">
+          
+          <div class="features">read-only, inherited</div>
+</dd>
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor inherited" id="instance-methods">
+      <h2>Methods</h2>
+      <dl class="callables">
+        <dt id="noSuchMethod" class="callable inherited">
+          <span class="name"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
+            <span class="returntype parameter">&#8594; dynamic</span>
+          </span>
+          </dt>
+        <dd class="inherited">
+          
+          <div class="features">inherited</div>
+</dd>
+        <dt id="toString" class="callable inherited">
+          <span class="name"><a href="fake/GenericClass/toString.html">toString</a></span><span class="signature">(<wbr>)
+            <span class="returntype parameter">&#8594; String</span>
+          </span>
+          </dt>
+        <dd class="inherited">
+          
+          <div class="features">inherited</div>
+</dd>
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor inherited" id="operators">
+      <h2>Operators</h2>
+      <dl class="callables">
+        <dt id="operator ==" class="callable inherited">
+          <span class="name"><a href="fake/GenericClass/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
+            <span class="returntype parameter">&#8594; bool</span>
+          </span>
+          </dt>
+        <dd class="inherited">
+          
+          <div class="features">inherited</div>
+</dd>
+      </dl>
+    </section>
+
+
+
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+    <ol>
+      <li class="section-title"><a href="fake/ModifierClass-class.html#constructors">Constructors</a></li>
+      <li><a href="fake/ModifierClass/ModifierClass.html">ModifierClass</a></li>
+    
+      <li class="section-title">
+        <a href="fake/ModifierClass-class.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/ModifierClass/modifierMember.html">modifierMember</a></li>
+      <li><a href="fake/ModifierClass/overrideByBoth.html">overrideByBoth</a></li>
+      <li><a href="fake/ModifierClass/overrideByEverything.html">overrideByEverything</a></li>
+      <li><a href="fake/ModifierClass/overrideByModifierClass.html">overrideByModifierClass</a></li>
+      <li class="inherited"><a href="fake/GenericClass/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/GenericClass/member.html">member</a></li>
+      <li class="inherited"><a href="fake/GenericClass/overrideByGenericMixin.html">overrideByGenericMixin</a></li>
+      <li class="inherited"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/ModifierClass-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/GenericClass/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/ModifierClass-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/GenericClass/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs_dev/fake/ModifierClass/ModifierClass.html b/testing/test_package_docs_dev/fake/ModifierClass/ModifierClass.html
new file mode 100644
index 0000000000..1c4853f334
--- /dev/null
+++ b/testing/test_package_docs_dev/fake/ModifierClass/ModifierClass.html
@@ -0,0 +1,103 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the ModifierClass constructor from the Class ModifierClass class from the fake library, for the Dart programming language.">
+  <title>ModifierClass constructor - ModifierClass class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/ModifierClass-class.html">ModifierClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
+    <li class="self-crumb">ModifierClass constructor</li>
+  </ol>
+  <div class="self-name">ModifierClass</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>ModifierClass class</h5>
+    <ol>
+      <li class="section-title"><a href="fake/ModifierClass-class.html#constructors">Constructors</a></li>
+      <li><a href="fake/ModifierClass/ModifierClass.html">ModifierClass</a></li>
+    
+      <li class="section-title">
+        <a href="fake/ModifierClass-class.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/ModifierClass/modifierMember.html">modifierMember</a></li>
+      <li><a href="fake/ModifierClass/overrideByBoth.html">overrideByBoth</a></li>
+      <li><a href="fake/ModifierClass/overrideByEverything.html">overrideByEverything</a></li>
+      <li><a href="fake/ModifierClass/overrideByModifierClass.html">overrideByModifierClass</a></li>
+      <li class="inherited"><a href="fake/GenericClass/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/GenericClass/member.html">member</a></li>
+      <li class="inherited"><a href="fake/GenericClass/overrideByGenericMixin.html">overrideByGenericMixin</a></li>
+      <li class="inherited"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/ModifierClass-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/GenericClass/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/ModifierClass-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/GenericClass/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-left-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>ModifierClass&lt;<wbr><span class="type-parameter">T</span>&gt; constructor</h1>
+
+    <section class="multi-line-signature">
+      
+      <span class="name ">ModifierClass&lt;<wbr><span class="type-parameter">T</span>&gt;</span>(<wbr>)
+    </section>
+
+    
+    
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs_dev/fake/ModifierClass/modifierMember.html b/testing/test_package_docs_dev/fake/ModifierClass/modifierMember.html
new file mode 100644
index 0000000000..d66b050652
--- /dev/null
+++ b/testing/test_package_docs_dev/fake/ModifierClass/modifierMember.html
@@ -0,0 +1,102 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the modifierMember property from the ModifierClass class, for the Dart programming language.">
+  <title>modifierMember property - ModifierClass class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/ModifierClass-class.html">ModifierClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
+    <li class="self-crumb">modifierMember property</li>
+  </ol>
+  <div class="self-name">modifierMember</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>ModifierClass class</h5>
+    <ol>
+      <li class="section-title"><a href="fake/ModifierClass-class.html#constructors">Constructors</a></li>
+      <li><a href="fake/ModifierClass/ModifierClass.html">ModifierClass</a></li>
+    
+      <li class="section-title">
+        <a href="fake/ModifierClass-class.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/ModifierClass/modifierMember.html">modifierMember</a></li>
+      <li><a href="fake/ModifierClass/overrideByBoth.html">overrideByBoth</a></li>
+      <li><a href="fake/ModifierClass/overrideByEverything.html">overrideByEverything</a></li>
+      <li><a href="fake/ModifierClass/overrideByModifierClass.html">overrideByModifierClass</a></li>
+      <li class="inherited"><a href="fake/GenericClass/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/GenericClass/member.html">member</a></li>
+      <li class="inherited"><a href="fake/GenericClass/overrideByGenericMixin.html">overrideByGenericMixin</a></li>
+      <li class="inherited"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/ModifierClass-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/GenericClass/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/ModifierClass-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/GenericClass/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>modifierMember property</h1>
+
+        <section class="multi-line-signature">
+          <span class="returntype">T</span>
+          <span class="name ">modifierMember</span>
+          <div class="features">read / write</div>
+        </section>
+                
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs_dev/fake/ModifierClass/overrideByBoth.html b/testing/test_package_docs_dev/fake/ModifierClass/overrideByBoth.html
new file mode 100644
index 0000000000..84fdf6961e
--- /dev/null
+++ b/testing/test_package_docs_dev/fake/ModifierClass/overrideByBoth.html
@@ -0,0 +1,105 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the overrideByBoth property from the ModifierClass class, for the Dart programming language.">
+  <title>overrideByBoth property - ModifierClass class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/ModifierClass-class.html">ModifierClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
+    <li class="self-crumb">overrideByBoth property</li>
+  </ol>
+  <div class="self-name">overrideByBoth</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>ModifierClass class</h5>
+    <ol>
+      <li class="section-title"><a href="fake/ModifierClass-class.html#constructors">Constructors</a></li>
+      <li><a href="fake/ModifierClass/ModifierClass.html">ModifierClass</a></li>
+    
+      <li class="section-title">
+        <a href="fake/ModifierClass-class.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/ModifierClass/modifierMember.html">modifierMember</a></li>
+      <li><a href="fake/ModifierClass/overrideByBoth.html">overrideByBoth</a></li>
+      <li><a href="fake/ModifierClass/overrideByEverything.html">overrideByEverything</a></li>
+      <li><a href="fake/ModifierClass/overrideByModifierClass.html">overrideByModifierClass</a></li>
+      <li class="inherited"><a href="fake/GenericClass/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/GenericClass/member.html">member</a></li>
+      <li class="inherited"><a href="fake/GenericClass/overrideByGenericMixin.html">overrideByGenericMixin</a></li>
+      <li class="inherited"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/ModifierClass-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/GenericClass/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/ModifierClass-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/GenericClass/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>overrideByBoth property</h1>
+
+        <section class="multi-line-signature">
+          <span class="returntype">T</span>
+          <span class="name ">overrideByBoth</span>
+          <div class="features">read / write</div>
+        </section>
+        <section class="desc markdown">
+          <p>Destined to be overridden by <a href="fake/ModifierClass-class.html">ModifierClass</a> and <a href="fake/GenericMixin-mixin.html">GenericMixin</a>, both.</p>
+        </section>
+                
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs_dev/fake/ModifierClass/overrideByEverything.html b/testing/test_package_docs_dev/fake/ModifierClass/overrideByEverything.html
new file mode 100644
index 0000000000..6746496c49
--- /dev/null
+++ b/testing/test_package_docs_dev/fake/ModifierClass/overrideByEverything.html
@@ -0,0 +1,105 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the overrideByEverything property from the ModifierClass class, for the Dart programming language.">
+  <title>overrideByEverything property - ModifierClass class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/ModifierClass-class.html">ModifierClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
+    <li class="self-crumb">overrideByEverything property</li>
+  </ol>
+  <div class="self-name">overrideByEverything</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>ModifierClass class</h5>
+    <ol>
+      <li class="section-title"><a href="fake/ModifierClass-class.html#constructors">Constructors</a></li>
+      <li><a href="fake/ModifierClass/ModifierClass.html">ModifierClass</a></li>
+    
+      <li class="section-title">
+        <a href="fake/ModifierClass-class.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/ModifierClass/modifierMember.html">modifierMember</a></li>
+      <li><a href="fake/ModifierClass/overrideByBoth.html">overrideByBoth</a></li>
+      <li><a href="fake/ModifierClass/overrideByEverything.html">overrideByEverything</a></li>
+      <li><a href="fake/ModifierClass/overrideByModifierClass.html">overrideByModifierClass</a></li>
+      <li class="inherited"><a href="fake/GenericClass/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/GenericClass/member.html">member</a></li>
+      <li class="inherited"><a href="fake/GenericClass/overrideByGenericMixin.html">overrideByGenericMixin</a></li>
+      <li class="inherited"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/ModifierClass-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/GenericClass/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/ModifierClass-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/GenericClass/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>overrideByEverything property</h1>
+
+        <section class="multi-line-signature">
+          <span class="returntype">T</span>
+          <span class="name ">overrideByEverything</span>
+          <div class="features">read / write</div>
+        </section>
+        <section class="desc markdown">
+          <p>Destined to be overridden by everything.</p>
+        </section>
+                
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs_dev/fake/ModifierClass/overrideByModifierClass.html b/testing/test_package_docs_dev/fake/ModifierClass/overrideByModifierClass.html
new file mode 100644
index 0000000000..2d01cea479
--- /dev/null
+++ b/testing/test_package_docs_dev/fake/ModifierClass/overrideByModifierClass.html
@@ -0,0 +1,105 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the overrideByModifierClass property from the ModifierClass class, for the Dart programming language.">
+  <title>overrideByModifierClass property - ModifierClass class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/ModifierClass-class.html">ModifierClass<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></a></li>
+    <li class="self-crumb">overrideByModifierClass property</li>
+  </ol>
+  <div class="self-name">overrideByModifierClass</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>ModifierClass class</h5>
+    <ol>
+      <li class="section-title"><a href="fake/ModifierClass-class.html#constructors">Constructors</a></li>
+      <li><a href="fake/ModifierClass/ModifierClass.html">ModifierClass</a></li>
+    
+      <li class="section-title">
+        <a href="fake/ModifierClass-class.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/ModifierClass/modifierMember.html">modifierMember</a></li>
+      <li><a href="fake/ModifierClass/overrideByBoth.html">overrideByBoth</a></li>
+      <li><a href="fake/ModifierClass/overrideByEverything.html">overrideByEverything</a></li>
+      <li><a href="fake/ModifierClass/overrideByModifierClass.html">overrideByModifierClass</a></li>
+      <li class="inherited"><a href="fake/GenericClass/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/GenericClass/member.html">member</a></li>
+      <li class="inherited"><a href="fake/GenericClass/overrideByGenericMixin.html">overrideByGenericMixin</a></li>
+      <li class="inherited"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/ModifierClass-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/GenericClass/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/ModifierClass-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/GenericClass/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>overrideByModifierClass property</h1>
+
+        <section class="multi-line-signature">
+          <span class="returntype">T</span>
+          <span class="name ">overrideByModifierClass</span>
+          <div class="features">read / write</div>
+        </section>
+        <section class="desc markdown">
+          <p>Destined to be overridden by <a href="fake/ModifierClass-class.html">ModifierClass</a>.</p>
+        </section>
+                
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs_dev/fake/NAME_SINGLEUNDERSCORE-constant.html b/testing/test_package_docs_dev/fake/NAME_SINGLEUNDERSCORE-constant.html
index 32d6460408..696662d762 100644
--- a/testing/test_package_docs_dev/fake/NAME_SINGLEUNDERSCORE-constant.html
+++ b/testing/test_package_docs_dev/fake/NAME_SINGLEUNDERSCORE-constant.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/NAME_WITH_TWO_UNDERSCORES-constant.html b/testing/test_package_docs_dev/fake/NAME_WITH_TWO_UNDERSCORES-constant.html
index 4bdb4136fd..2a81d2d5bf 100644
--- a/testing/test_package_docs_dev/fake/NAME_WITH_TWO_UNDERSCORES-constant.html
+++ b/testing/test_package_docs_dev/fake/NAME_WITH_TWO_UNDERSCORES-constant.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/NewGenericTypedef.html b/testing/test_package_docs_dev/fake/NewGenericTypedef.html
index 9d6a219514..f7802c1204 100644
--- a/testing/test_package_docs_dev/fake/NewGenericTypedef.html
+++ b/testing/test_package_docs_dev/fake/NewGenericTypedef.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/NewStyleMixinCallingSuper-mixin.html b/testing/test_package_docs_dev/fake/NewStyleMixinCallingSuper-mixin.html
new file mode 100644
index 0000000000..81bbaae916
--- /dev/null
+++ b/testing/test_package_docs_dev/fake/NewStyleMixinCallingSuper-mixin.html
@@ -0,0 +1,326 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the NewStyleMixinCallingSuper mixin from the fake library, for the Dart programming language.">
+  <title>NewStyleMixinCallingSuper mixin - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li class="self-crumb">NewStyleMixinCallingSuper mixin</li>
+  </ol>
+  <div class="self-name">NewStyleMixinCallingSuper</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>fake library</h5>
+    <ol>
+      <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
+      <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
+      <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
+      <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
+      <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
+      <li><a href="fake/Annotation-class.html">Annotation</a></li>
+      <li><a href="fake/AnotherInterface-class.html">AnotherInterface</a></li>
+      <li><a href="fake/ATypeTakingClass-class.html">ATypeTakingClass</a></li>
+      <li><a href="fake/ATypeTakingClassMixedIn-class.html">ATypeTakingClassMixedIn</a></li>
+      <li><a href="fake/BaseForDocComments-class.html">BaseForDocComments</a></li>
+      <li><a href="fake/BaseThingy-class.html">BaseThingy</a></li>
+      <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
+      <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
+      <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
+      <li><a href="fake/Cool-class.html">Cool</a></li>
+      <li><a href="fake/DocumentWithATable-class.html">DocumentWithATable</a></li>
+      <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
+      <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
+      <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
+      <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
+      <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
+      <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
+      <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
+      <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
+      <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
+      <li><a href="fake/ImplicitProperties-class.html">ImplicitProperties</a></li>
+      <li><a href="fake/InheritingClassOne-class.html">InheritingClassOne</a></li>
+      <li><a href="fake/InheritingClassTwo-class.html">InheritingClassTwo</a></li>
+      <li><a href="fake/Interface-class.html">Interface</a></li>
+      <li><a href="fake/LongFirstLine-class.html">LongFirstLine</a></li>
+      <li><a href="fake/MIEEBase-class.html">MIEEBase</a></li>
+      <li><a href="fake/MIEEMixin-class.html">MIEEMixin</a></li>
+      <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
+      <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
+      <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
+      <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
+      <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
+      <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
+      <li><a href="fake/ReferringClass-class.html">ReferringClass</a></li>
+      <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+      <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
+      <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
+      <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
+      <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
+      <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
+      <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
+      <li><a href="fake/CUSTOM_CLASS_PRIVATE-constant.html">CUSTOM_CLASS_PRIVATE</a></li>
+      <li><a class="deprecated" href="fake/DOWN-constant.html">DOWN</a></li>
+      <li><a href="fake/greatAnnotation-constant.html">greatAnnotation</a></li>
+      <li><a href="fake/greatestAnnotation-constant.html">greatestAnnotation</a></li>
+      <li><a href="fake/incorrectDocReference-constant.html">incorrectDocReference</a></li>
+      <li><a href="fake/myMap-constant.html">myMap</a></li>
+      <li><a href="fake/NAME_SINGLEUNDERSCORE-constant.html">NAME_SINGLEUNDERSCORE</a></li>
+      <li><a href="fake/NAME_WITH_TWO_UNDERSCORES-constant.html">NAME_WITH_TWO_UNDERSCORES</a></li>
+      <li><a href="fake/PI-constant.html">PI</a></li>
+      <li><a href="fake/required-constant.html">required</a></li>
+      <li><a href="fake/testingCodeSyntaxInOneLiners-constant.html">testingCodeSyntaxInOneLiners</a></li>
+      <li><a href="fake/UP-constant.html">UP</a></li>
+      <li><a href="fake/ZERO-constant.html">ZERO</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
+      <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
+      <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
+      <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
+      <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
+      <li><a href="fake/justGetter.html">justGetter</a></li>
+      <li><a href="fake/justSetter.html">justSetter</a></li>
+      <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
+      <li><a class="deprecated" href="fake/meaningOfLife.html">meaningOfLife</a></li>
+      <li><a href="fake/mustGetThis.html">mustGetThis</a></li>
+      <li><a href="fake/setAndGet.html">setAndGet</a></li>
+      <li><a href="fake/simpleProperty.html">simpleProperty</a></li>
+      <li><a href="fake/useSomethingInAnotherPackage.html">useSomethingInAnotherPackage</a></li>
+      <li><a href="fake/useSomethingInTheSdk.html">useSomethingInTheSdk</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#functions">Functions</a></li>
+      <li><a href="fake/addCallback.html">addCallback</a></li>
+      <li><a href="fake/addCallback2.html">addCallback2</a></li>
+      <li><a href="fake/aVoidParameter.html">aVoidParameter</a></li>
+      <li><a href="fake/functionWithFunctionParameters.html">functionWithFunctionParameters</a></li>
+      <li><a href="fake/myGenericFunction.html">myGenericFunction</a></li>
+      <li><a href="fake/onlyPositionalWithNoDefaultNoType.html">onlyPositionalWithNoDefaultNoType</a></li>
+      <li><a href="fake/paintImage1.html">paintImage1</a></li>
+      <li><a href="fake/paintImage2.html">paintImage2</a></li>
+      <li><a href="fake/paramFromAnotherLib.html">paramFromAnotherLib</a></li>
+      <li><a href="fake/paramOfFutureOrNull.html">paramOfFutureOrNull</a></li>
+      <li><a href="fake/returningFutureVoid.html">returningFutureVoid</a></li>
+      <li><a href="fake/short.html">short</a></li>
+      <li><a href="fake/soIntense.html">soIntense</a></li>
+      <li><a href="fake/thisIsAlsoAsync.html">thisIsAlsoAsync</a></li>
+      <li><a href="fake/thisIsAsync.html">thisIsAsync</a></li>
+      <li><a href="fake/thisIsFutureOr.html">thisIsFutureOr</a></li>
+      <li><a href="fake/thisIsFutureOrNull.html">thisIsFutureOrNull</a></li>
+      <li><a href="fake/thisIsFutureOrT.html">thisIsFutureOrT</a></li>
+      <li><a class="deprecated" href="fake/topLevelFunction.html">topLevelFunction</a></li>
+      <li><a href="fake/typeParamOfFutureOr.html">typeParamOfFutureOr</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#enums">Enums</a></li>
+      <li><a href="fake/Color-class.html">Color</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#typedefs">Typedefs</a></li>
+      <li><a href="fake/Callback2.html">Callback2</a></li>
+      <li><a class="deprecated" href="fake/FakeProcesses.html">FakeProcesses</a></li>
+      <li><a href="fake/GenericTypedef.html">GenericTypedef</a></li>
+      <li><a href="fake/LotsAndLotsOfParameters.html">LotsAndLotsOfParameters</a></li>
+      <li><a href="fake/myCoolTypedef.html">myCoolTypedef</a></li>
+      <li><a href="fake/NewGenericTypedef.html">NewGenericTypedef</a></li>
+      <li><a href="fake/VoidCallback.html">VoidCallback</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#exceptions">Exceptions</a></li>
+      <li><a class="deprecated" href="fake/Doh-class.html">Doh</a></li>
+      <li><a href="fake/Oops-class.html">Oops</a></li>
+    </ol>
+  </div>
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+      <h1>NewStyleMixinCallingSuper mixin </h1>
+
+    <section class="desc markdown">
+      <p>I am a new style mixin using the new mixin syntax.</p>
+    </section>
+    
+    <section>
+      <dl class="dl-horizontal">
+        <dt>Superclass Constraints</dt>
+        <dd><ul class="comma-separated dark mixin-relationships">
+          <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
+        </ul></dd>
+
+
+
+
+        <dt>Implemented by</dt>
+        <dd><ul class="comma-separated mixin-relationships">
+          <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
+        </ul></dd>
+
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor" id="constructors">
+      <h2>Constructors</h2>
+
+      <dl class="constructor-summary-list">
+        <dt id="NewStyleMixinCallingSuper" class="callable">
+          <span class="name"><a href="fake/NewStyleMixinCallingSuper/NewStyleMixinCallingSuper.html">NewStyleMixinCallingSuper</a></span><span class="signature">()</span>
+        </dt>
+        <dd>
+          
+        </dd>
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor" id="instance-properties">
+      <h2>Properties</h2>
+
+      <dl class="properties">
+        <dt id="superString" class="property">
+          <span class="name"><a href="fake/NewStyleMixinCallingSuper/superString.html">superString</a></span>
+          <span class="signature">&#8594; String</span> 
+        </dt>
+        <dd>
+          I have documentation for an overridden method named <a href="fake/NewStyleMixinCallingSuper/superString.html">superString</a>,
+different from <a href="fake/NotAMixin/superString.html">NotAMixin.superString</a>.
+          <div class="features">read-only</div>
+</dd>
+        <dt id="hashCode" class="property inherited">
+          <span class="name"><a href="fake/NotAMixin/hashCode.html">hashCode</a></span>
+          <span class="signature">&#8594; int</span> 
+        </dt>
+        <dd class="inherited">
+          
+          <div class="features">read-only, inherited</div>
+</dd>
+        <dt id="runtimeType" class="property inherited">
+          <span class="name"><a href="fake/NotAMixin/runtimeType.html">runtimeType</a></span>
+          <span class="signature">&#8594; Type</span> 
+        </dt>
+        <dd class="inherited">
+          
+          <div class="features">read-only, inherited</div>
+</dd>
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor inherited" id="instance-methods">
+      <h2>Methods</h2>
+      <dl class="callables">
+        <dt id="noSuchMethod" class="callable inherited">
+          <span class="name"><a href="fake/NotAMixin/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
+            <span class="returntype parameter">&#8594; dynamic</span>
+          </span>
+          </dt>
+        <dd class="inherited">
+          
+          <div class="features">inherited</div>
+</dd>
+        <dt id="toString" class="callable inherited">
+          <span class="name"><a href="fake/NotAMixin/toString.html">toString</a></span><span class="signature">(<wbr>)
+            <span class="returntype parameter">&#8594; String</span>
+          </span>
+          </dt>
+        <dd class="inherited">
+          
+          <div class="features">inherited</div>
+</dd>
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor inherited" id="operators">
+      <h2>Operators</h2>
+      <dl class="callables">
+        <dt id="operator ==" class="callable inherited">
+          <span class="name"><a href="fake/NotAMixin/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
+            <span class="returntype parameter">&#8594; bool</span>
+          </span>
+          </dt>
+        <dd class="inherited">
+          
+          <div class="features">inherited</div>
+</dd>
+      </dl>
+    </section>
+
+
+
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+    <ol>
+      <li class="section-title"><a href="fake/NewStyleMixinCallingSuper-mixin.html#constructors">Constructors</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper/NewStyleMixinCallingSuper.html">NewStyleMixinCallingSuper</a></li>
+    
+      <li class="section-title">
+        <a href="fake/NewStyleMixinCallingSuper-mixin.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/NewStyleMixinCallingSuper/superString.html">superString</a></li>
+      <li class="inherited"><a href="fake/NotAMixin/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/NotAMixin/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/NewStyleMixinCallingSuper-mixin.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/NotAMixin/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/NotAMixin/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/NewStyleMixinCallingSuper-mixin.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/NotAMixin/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs_dev/fake/NewStyleMixinCallingSuper/NewStyleMixinCallingSuper.html b/testing/test_package_docs_dev/fake/NewStyleMixinCallingSuper/NewStyleMixinCallingSuper.html
new file mode 100644
index 0000000000..32a75659c9
--- /dev/null
+++ b/testing/test_package_docs_dev/fake/NewStyleMixinCallingSuper/NewStyleMixinCallingSuper.html
@@ -0,0 +1,98 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the NewStyleMixinCallingSuper constructor from the Mixin NewStyleMixinCallingSuper class from the fake library, for the Dart programming language.">
+  <title>NewStyleMixinCallingSuper constructor - NewStyleMixinCallingSuper class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    <li class="self-crumb">NewStyleMixinCallingSuper constructor</li>
+  </ol>
+  <div class="self-name">NewStyleMixinCallingSuper</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>NewStyleMixinCallingSuper mixin</h5>
+    <ol>
+      <li class="section-title"><a href="fake/NewStyleMixinCallingSuper-mixin.html#constructors">Constructors</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper/NewStyleMixinCallingSuper.html">NewStyleMixinCallingSuper</a></li>
+    
+      <li class="section-title">
+        <a href="fake/NewStyleMixinCallingSuper-mixin.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/NewStyleMixinCallingSuper/superString.html">superString</a></li>
+      <li class="inherited"><a href="fake/NotAMixin/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/NotAMixin/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/NewStyleMixinCallingSuper-mixin.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/NotAMixin/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/NotAMixin/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/NewStyleMixinCallingSuper-mixin.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/NotAMixin/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-left-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>NewStyleMixinCallingSuper constructor</h1>
+
+    <section class="multi-line-signature">
+      
+      <span class="name ">NewStyleMixinCallingSuper</span>(<wbr>)
+    </section>
+
+    
+    
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs_dev/fake/NewStyleMixinCallingSuper/superString.html b/testing/test_package_docs_dev/fake/NewStyleMixinCallingSuper/superString.html
new file mode 100644
index 0000000000..fd52e90b30
--- /dev/null
+++ b/testing/test_package_docs_dev/fake/NewStyleMixinCallingSuper/superString.html
@@ -0,0 +1,106 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the superString property from the NewStyleMixinCallingSuper class, for the Dart programming language.">
+  <title>superString property - NewStyleMixinCallingSuper class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    <li class="self-crumb">superString property</li>
+  </ol>
+  <div class="self-name">superString</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>NewStyleMixinCallingSuper mixin</h5>
+    <ol>
+      <li class="section-title"><a href="fake/NewStyleMixinCallingSuper-mixin.html#constructors">Constructors</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper/NewStyleMixinCallingSuper.html">NewStyleMixinCallingSuper</a></li>
+    
+      <li class="section-title">
+        <a href="fake/NewStyleMixinCallingSuper-mixin.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/NewStyleMixinCallingSuper/superString.html">superString</a></li>
+      <li class="inherited"><a href="fake/NotAMixin/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/NotAMixin/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/NewStyleMixinCallingSuper-mixin.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/NotAMixin/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/NotAMixin/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/NewStyleMixinCallingSuper-mixin.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/NotAMixin/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>superString property</h1>
+
+
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">String</span>
+          <span class="name ">superString</span>
+  
+</section>
+        
+        <section class="desc markdown">
+  <p>I have documentation for an overridden method named <a href="fake/NewStyleMixinCallingSuper/superString.html">superString</a>,
+different from <a href="fake/NotAMixin/superString.html">NotAMixin.superString</a>.</p>
+</section>
+
+</section>
+        
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs_dev/fake/NotAMixin-class.html b/testing/test_package_docs_dev/fake/NotAMixin-class.html
index ec51b9706e..c2ac8bd837 100644
--- a/testing/test_package_docs_dev/fake/NotAMixin-class.html
+++ b/testing/test_package_docs_dev/fake/NotAMixin-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
@@ -170,6 +178,7 @@ <h1>NotAMixin class </h1>
 
         <dt>Implementers</dt>
         <dd><ul class="comma-separated clazz-relationships">
+          <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
           <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
         </ul></dd>
 
diff --git a/testing/test_package_docs_dev/fake/Oops-class.html b/testing/test_package_docs_dev/fake/Oops-class.html
index 2f77a02f03..b9341e4a59 100644
--- a/testing/test_package_docs_dev/fake/Oops-class.html
+++ b/testing/test_package_docs_dev/fake/Oops-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/OperatorReferenceClass-class.html b/testing/test_package_docs_dev/fake/OperatorReferenceClass-class.html
index f8517fe13f..ae0fbaf40f 100644
--- a/testing/test_package_docs_dev/fake/OperatorReferenceClass-class.html
+++ b/testing/test_package_docs_dev/fake/OperatorReferenceClass-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/OtherGenericsThing-class.html b/testing/test_package_docs_dev/fake/OtherGenericsThing-class.html
index 17de2ff97b..6f3e56aa84 100644
--- a/testing/test_package_docs_dev/fake/OtherGenericsThing-class.html
+++ b/testing/test_package_docs_dev/fake/OtherGenericsThing-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/PI-constant.html b/testing/test_package_docs_dev/fake/PI-constant.html
index a12cff97f3..2ec1300b5e 100644
--- a/testing/test_package_docs_dev/fake/PI-constant.html
+++ b/testing/test_package_docs_dev/fake/PI-constant.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/ReferringClass-class.html b/testing/test_package_docs_dev/fake/ReferringClass-class.html
index 3093f02230..8dc9c5c0f4 100644
--- a/testing/test_package_docs_dev/fake/ReferringClass-class.html
+++ b/testing/test_package_docs_dev/fake/ReferringClass-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/SpecialList-class.html b/testing/test_package_docs_dev/fake/SpecialList-class.html
index b399a2e799..8fee4805aa 100644
--- a/testing/test_package_docs_dev/fake/SpecialList-class.html
+++ b/testing/test_package_docs_dev/fake/SpecialList-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/SubForDocComments-class.html b/testing/test_package_docs_dev/fake/SubForDocComments-class.html
index 6e24cb5a59..8537b5db99 100644
--- a/testing/test_package_docs_dev/fake/SubForDocComments-class.html
+++ b/testing/test_package_docs_dev/fake/SubForDocComments-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/SuperAwesomeClass-class.html b/testing/test_package_docs_dev/fake/SuperAwesomeClass-class.html
index 178d626081..e8f94f4fbd 100644
--- a/testing/test_package_docs_dev/fake/SuperAwesomeClass-class.html
+++ b/testing/test_package_docs_dev/fake/SuperAwesomeClass-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/TypeInferenceMixedIn-class.html b/testing/test_package_docs_dev/fake/TypeInferenceMixedIn-class.html
new file mode 100644
index 0000000000..feace494fb
--- /dev/null
+++ b/testing/test_package_docs_dev/fake/TypeInferenceMixedIn-class.html
@@ -0,0 +1,381 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the TypeInferenceMixedIn class from the fake library, for the Dart programming language.">
+  <title>TypeInferenceMixedIn class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li class="self-crumb">TypeInferenceMixedIn class</li>
+  </ol>
+  <div class="self-name">TypeInferenceMixedIn</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>fake library</h5>
+    <ol>
+      <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
+      <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
+      <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
+      <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
+      <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
+      <li><a href="fake/Annotation-class.html">Annotation</a></li>
+      <li><a href="fake/AnotherInterface-class.html">AnotherInterface</a></li>
+      <li><a href="fake/ATypeTakingClass-class.html">ATypeTakingClass</a></li>
+      <li><a href="fake/ATypeTakingClassMixedIn-class.html">ATypeTakingClassMixedIn</a></li>
+      <li><a href="fake/BaseForDocComments-class.html">BaseForDocComments</a></li>
+      <li><a href="fake/BaseThingy-class.html">BaseThingy</a></li>
+      <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
+      <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
+      <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
+      <li><a href="fake/Cool-class.html">Cool</a></li>
+      <li><a href="fake/DocumentWithATable-class.html">DocumentWithATable</a></li>
+      <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
+      <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
+      <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
+      <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
+      <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
+      <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
+      <li><a href="categoriesExported/IAmAClassWithCategories-class.html">IAmAClassWithCategories</a></li>
+      <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
+      <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
+      <li><a href="fake/ImplementsFutureVoid-class.html">ImplementsFutureVoid</a></li>
+      <li><a href="fake/ImplicitProperties-class.html">ImplicitProperties</a></li>
+      <li><a href="fake/InheritingClassOne-class.html">InheritingClassOne</a></li>
+      <li><a href="fake/InheritingClassTwo-class.html">InheritingClassTwo</a></li>
+      <li><a href="fake/Interface-class.html">Interface</a></li>
+      <li><a href="fake/LongFirstLine-class.html">LongFirstLine</a></li>
+      <li><a href="fake/MIEEBase-class.html">MIEEBase</a></li>
+      <li><a href="fake/MIEEMixin-class.html">MIEEMixin</a></li>
+      <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
+      <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
+      <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
+      <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
+      <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
+      <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
+      <li><a href="fake/ReferringClass-class.html">ReferringClass</a></li>
+      <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+      <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
+      <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
+      <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
+      <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
+      <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
+      <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
+      <li><a href="fake/CUSTOM_CLASS_PRIVATE-constant.html">CUSTOM_CLASS_PRIVATE</a></li>
+      <li><a class="deprecated" href="fake/DOWN-constant.html">DOWN</a></li>
+      <li><a href="fake/greatAnnotation-constant.html">greatAnnotation</a></li>
+      <li><a href="fake/greatestAnnotation-constant.html">greatestAnnotation</a></li>
+      <li><a href="fake/incorrectDocReference-constant.html">incorrectDocReference</a></li>
+      <li><a href="fake/myMap-constant.html">myMap</a></li>
+      <li><a href="fake/NAME_SINGLEUNDERSCORE-constant.html">NAME_SINGLEUNDERSCORE</a></li>
+      <li><a href="fake/NAME_WITH_TWO_UNDERSCORES-constant.html">NAME_WITH_TWO_UNDERSCORES</a></li>
+      <li><a href="fake/PI-constant.html">PI</a></li>
+      <li><a href="fake/required-constant.html">required</a></li>
+      <li><a href="fake/testingCodeSyntaxInOneLiners-constant.html">testingCodeSyntaxInOneLiners</a></li>
+      <li><a href="fake/UP-constant.html">UP</a></li>
+      <li><a href="fake/ZERO-constant.html">ZERO</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
+      <li><a href="fake/aCoolVariable.html">aCoolVariable</a></li>
+      <li><a href="fake/complicatedReturn.html">complicatedReturn</a></li>
+      <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
+      <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
+      <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/importantComputations.html">importantComputations</a></li>
+      <li><a href="fake/justGetter.html">justGetter</a></li>
+      <li><a href="fake/justSetter.html">justSetter</a></li>
+      <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
+      <li><a class="deprecated" href="fake/meaningOfLife.html">meaningOfLife</a></li>
+      <li><a href="fake/mustGetThis.html">mustGetThis</a></li>
+      <li><a href="fake/setAndGet.html">setAndGet</a></li>
+      <li><a href="fake/simpleProperty.html">simpleProperty</a></li>
+      <li><a href="fake/useSomethingInAnotherPackage.html">useSomethingInAnotherPackage</a></li>
+      <li><a href="fake/useSomethingInTheSdk.html">useSomethingInTheSdk</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#functions">Functions</a></li>
+      <li><a href="fake/addCallback.html">addCallback</a></li>
+      <li><a href="fake/addCallback2.html">addCallback2</a></li>
+      <li><a href="fake/aVoidParameter.html">aVoidParameter</a></li>
+      <li><a href="fake/functionWithFunctionParameters.html">functionWithFunctionParameters</a></li>
+      <li><a href="fake/myGenericFunction.html">myGenericFunction</a></li>
+      <li><a href="fake/onlyPositionalWithNoDefaultNoType.html">onlyPositionalWithNoDefaultNoType</a></li>
+      <li><a href="fake/paintImage1.html">paintImage1</a></li>
+      <li><a href="fake/paintImage2.html">paintImage2</a></li>
+      <li><a href="fake/paramFromAnotherLib.html">paramFromAnotherLib</a></li>
+      <li><a href="fake/paramOfFutureOrNull.html">paramOfFutureOrNull</a></li>
+      <li><a href="fake/returningFutureVoid.html">returningFutureVoid</a></li>
+      <li><a href="fake/short.html">short</a></li>
+      <li><a href="fake/soIntense.html">soIntense</a></li>
+      <li><a href="fake/thisIsAlsoAsync.html">thisIsAlsoAsync</a></li>
+      <li><a href="fake/thisIsAsync.html">thisIsAsync</a></li>
+      <li><a href="fake/thisIsFutureOr.html">thisIsFutureOr</a></li>
+      <li><a href="fake/thisIsFutureOrNull.html">thisIsFutureOrNull</a></li>
+      <li><a href="fake/thisIsFutureOrT.html">thisIsFutureOrT</a></li>
+      <li><a class="deprecated" href="fake/topLevelFunction.html">topLevelFunction</a></li>
+      <li><a href="fake/typeParamOfFutureOr.html">typeParamOfFutureOr</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#enums">Enums</a></li>
+      <li><a href="fake/Color-class.html">Color</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#typedefs">Typedefs</a></li>
+      <li><a href="fake/Callback2.html">Callback2</a></li>
+      <li><a class="deprecated" href="fake/FakeProcesses.html">FakeProcesses</a></li>
+      <li><a href="fake/GenericTypedef.html">GenericTypedef</a></li>
+      <li><a href="fake/LotsAndLotsOfParameters.html">LotsAndLotsOfParameters</a></li>
+      <li><a href="fake/myCoolTypedef.html">myCoolTypedef</a></li>
+      <li><a href="fake/NewGenericTypedef.html">NewGenericTypedef</a></li>
+      <li><a href="fake/VoidCallback.html">VoidCallback</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#exceptions">Exceptions</a></li>
+      <li><a class="deprecated" href="fake/Doh-class.html">Doh</a></li>
+      <li><a href="fake/Oops-class.html">Oops</a></li>
+    </ol>
+  </div>
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+      <h1>TypeInferenceMixedIn class </h1>
+
+    <section class="desc markdown">
+      <p>A class verifying type inference across new-style mixins.</p>
+    </section>
+    
+    <section>
+      <dl class="dl-horizontal">
+        <dt>Inheritance</dt>
+        <dd><ul class="gt-separated dark clazz-relationships">
+          <li>Object</li>
+          <li><a href="fake/GenericClass-class.html">GenericClass</a><span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></li>
+          <li><a href="fake/ModifierClass-class.html">ModifierClass</a><span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></li>
+          <li>TypeInferenceMixedIn</li>
+        </ul></dd>
+
+
+        <dt>Mixed in types</dt>
+        <dd><ul class="comma-separated clazz-relationships">
+          <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a><span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></li>
+        </ul></dd>
+
+
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor" id="constructors">
+      <h2>Constructors</h2>
+
+      <dl class="constructor-summary-list">
+        <dt id="TypeInferenceMixedIn" class="callable">
+          <span class="name"><a href="fake/TypeInferenceMixedIn/TypeInferenceMixedIn.html">TypeInferenceMixedIn</a></span><span class="signature">()</span>
+        </dt>
+        <dd>
+          
+        </dd>
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor" id="instance-properties">
+      <h2>Properties</h2>
+
+      <dl class="properties">
+        <dt id="overrideByEverything" class="property">
+          <span class="name"><a href="fake/TypeInferenceMixedIn/overrideByEverything.html">overrideByEverything</a></span>
+          <span class="signature">&#8596; int</span> 
+        </dt>
+        <dd>
+          Destined to be overridden by everything.
+          <div class="features">read / write</div>
+</dd>
+        <dt id="hashCode" class="property inherited">
+          <span class="name"><a href="fake/GenericClass/hashCode.html">hashCode</a></span>
+          <span class="signature">&#8594; int</span> 
+        </dt>
+        <dd class="inherited">
+          
+          <div class="features">read-only, inherited</div>
+</dd>
+        <dt id="member" class="property inherited">
+          <span class="name"><a href="fake/GenericClass/member.html">member</a></span>
+          <span class="signature">&#8596; int</span> 
+        </dt>
+        <dd class="inherited">
+          
+          <div class="features">read / write, inherited</div>
+</dd>
+        <dt id="mixinMember" class="property inherited">
+          <span class="name"><a href="fake/GenericMixin/mixinMember.html">mixinMember</a></span>
+          <span class="signature">&#8596; int</span> 
+        </dt>
+        <dd class="inherited">
+          
+          <div class="features">read / write, inherited</div>
+</dd>
+        <dt id="modifierMember" class="property inherited">
+          <span class="name"><a href="fake/ModifierClass/modifierMember.html">modifierMember</a></span>
+          <span class="signature">&#8596; int</span> 
+        </dt>
+        <dd class="inherited">
+          
+          <div class="features">read / write, inherited</div>
+</dd>
+        <dt id="overrideByBoth" class="property inherited">
+          <span class="name"><a href="fake/GenericMixin/overrideByBoth.html">overrideByBoth</a></span>
+          <span class="signature">&#8596; int</span> 
+        </dt>
+        <dd class="inherited">
+          Destined to be overridden by <a href="fake/ModifierClass-class.html">ModifierClass</a> and <a href="fake/GenericMixin-mixin.html">GenericMixin</a>, both.
+          <div class="features">read / write, inherited</div>
+</dd>
+        <dt id="overrideByGenericMixin" class="property inherited">
+          <span class="name"><a href="fake/GenericMixin/overrideByGenericMixin.html">overrideByGenericMixin</a></span>
+          <span class="signature">&#8596; int</span> 
+        </dt>
+        <dd class="inherited">
+          Destined to be overridden by <a href="fake/GenericMixin-mixin.html">GenericMixin</a>.
+          <div class="features">read / write, inherited</div>
+</dd>
+        <dt id="overrideByModifierClass" class="property inherited">
+          <span class="name"><a href="fake/ModifierClass/overrideByModifierClass.html">overrideByModifierClass</a></span>
+          <span class="signature">&#8596; int</span> 
+        </dt>
+        <dd class="inherited">
+          Destined to be overridden by <a href="fake/ModifierClass-class.html">ModifierClass</a>.
+          <div class="features">read / write, inherited</div>
+</dd>
+        <dt id="runtimeType" class="property inherited">
+          <span class="name"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></span>
+          <span class="signature">&#8594; Type</span> 
+        </dt>
+        <dd class="inherited">
+          
+          <div class="features">read-only, inherited</div>
+</dd>
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor inherited" id="instance-methods">
+      <h2>Methods</h2>
+      <dl class="callables">
+        <dt id="noSuchMethod" class="callable inherited">
+          <span class="name"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
+            <span class="returntype parameter">&#8594; dynamic</span>
+          </span>
+          </dt>
+        <dd class="inherited">
+          
+          <div class="features">inherited</div>
+</dd>
+        <dt id="toString" class="callable inherited">
+          <span class="name"><a href="fake/GenericClass/toString.html">toString</a></span><span class="signature">(<wbr>)
+            <span class="returntype parameter">&#8594; String</span>
+          </span>
+          </dt>
+        <dd class="inherited">
+          
+          <div class="features">inherited</div>
+</dd>
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor inherited" id="operators">
+      <h2>Operators</h2>
+      <dl class="callables">
+        <dt id="operator ==" class="callable inherited">
+          <span class="name"><a href="fake/GenericClass/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="type-annotation">dynamic</span> <span class="parameter-name">other</span></span>)
+            <span class="returntype parameter">&#8594; bool</span>
+          </span>
+          </dt>
+        <dd class="inherited">
+          
+          <div class="features">inherited</div>
+</dd>
+      </dl>
+    </section>
+
+
+
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+    <ol>
+      <li class="section-title"><a href="fake/TypeInferenceMixedIn-class.html#constructors">Constructors</a></li>
+      <li><a href="fake/TypeInferenceMixedIn/TypeInferenceMixedIn.html">TypeInferenceMixedIn</a></li>
+    
+      <li class="section-title">
+        <a href="fake/TypeInferenceMixedIn-class.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/TypeInferenceMixedIn/overrideByEverything.html">overrideByEverything</a></li>
+      <li class="inherited"><a href="fake/GenericClass/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/GenericClass/member.html">member</a></li>
+      <li class="inherited"><a href="fake/GenericMixin/mixinMember.html">mixinMember</a></li>
+      <li class="inherited"><a href="fake/ModifierClass/modifierMember.html">modifierMember</a></li>
+      <li class="inherited"><a href="fake/GenericMixin/overrideByBoth.html">overrideByBoth</a></li>
+      <li class="inherited"><a href="fake/GenericMixin/overrideByGenericMixin.html">overrideByGenericMixin</a></li>
+      <li class="inherited"><a href="fake/ModifierClass/overrideByModifierClass.html">overrideByModifierClass</a></li>
+      <li class="inherited"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/TypeInferenceMixedIn-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/GenericClass/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/TypeInferenceMixedIn-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/GenericClass/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs_dev/fake/TypeInferenceMixedIn/TypeInferenceMixedIn.html b/testing/test_package_docs_dev/fake/TypeInferenceMixedIn/TypeInferenceMixedIn.html
new file mode 100644
index 0000000000..283cf31f8b
--- /dev/null
+++ b/testing/test_package_docs_dev/fake/TypeInferenceMixedIn/TypeInferenceMixedIn.html
@@ -0,0 +1,104 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the TypeInferenceMixedIn constructor from the Class TypeInferenceMixedIn class from the fake library, for the Dart programming language.">
+  <title>TypeInferenceMixedIn constructor - TypeInferenceMixedIn class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
+    <li class="self-crumb">TypeInferenceMixedIn constructor</li>
+  </ol>
+  <div class="self-name">TypeInferenceMixedIn</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>TypeInferenceMixedIn class</h5>
+    <ol>
+      <li class="section-title"><a href="fake/TypeInferenceMixedIn-class.html#constructors">Constructors</a></li>
+      <li><a href="fake/TypeInferenceMixedIn/TypeInferenceMixedIn.html">TypeInferenceMixedIn</a></li>
+    
+      <li class="section-title">
+        <a href="fake/TypeInferenceMixedIn-class.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/TypeInferenceMixedIn/overrideByEverything.html">overrideByEverything</a></li>
+      <li class="inherited"><a href="fake/GenericClass/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/GenericClass/member.html">member</a></li>
+      <li class="inherited"><a href="fake/GenericMixin/mixinMember.html">mixinMember</a></li>
+      <li class="inherited"><a href="fake/ModifierClass/modifierMember.html">modifierMember</a></li>
+      <li class="inherited"><a href="fake/GenericMixin/overrideByBoth.html">overrideByBoth</a></li>
+      <li class="inherited"><a href="fake/GenericMixin/overrideByGenericMixin.html">overrideByGenericMixin</a></li>
+      <li class="inherited"><a href="fake/ModifierClass/overrideByModifierClass.html">overrideByModifierClass</a></li>
+      <li class="inherited"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/TypeInferenceMixedIn-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/GenericClass/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/TypeInferenceMixedIn-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/GenericClass/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-left-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>TypeInferenceMixedIn constructor</h1>
+
+    <section class="multi-line-signature">
+      
+      <span class="name ">TypeInferenceMixedIn</span>(<wbr>)
+    </section>
+
+    
+    
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs_dev/fake/TypeInferenceMixedIn/overrideByEverything.html b/testing/test_package_docs_dev/fake/TypeInferenceMixedIn/overrideByEverything.html
new file mode 100644
index 0000000000..3caf9cd554
--- /dev/null
+++ b/testing/test_package_docs_dev/fake/TypeInferenceMixedIn/overrideByEverything.html
@@ -0,0 +1,106 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the overrideByEverything property from the TypeInferenceMixedIn class, for the Dart programming language.">
+  <title>overrideByEverything property - TypeInferenceMixedIn class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
+    <li class="self-crumb">overrideByEverything property</li>
+  </ol>
+  <div class="self-name">overrideByEverything</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>TypeInferenceMixedIn class</h5>
+    <ol>
+      <li class="section-title"><a href="fake/TypeInferenceMixedIn-class.html#constructors">Constructors</a></li>
+      <li><a href="fake/TypeInferenceMixedIn/TypeInferenceMixedIn.html">TypeInferenceMixedIn</a></li>
+    
+      <li class="section-title">
+        <a href="fake/TypeInferenceMixedIn-class.html#instance-properties">Properties</a>
+      </li>
+      <li><a href="fake/TypeInferenceMixedIn/overrideByEverything.html">overrideByEverything</a></li>
+      <li class="inherited"><a href="fake/GenericClass/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/GenericClass/member.html">member</a></li>
+      <li class="inherited"><a href="fake/GenericMixin/mixinMember.html">mixinMember</a></li>
+      <li class="inherited"><a href="fake/ModifierClass/modifierMember.html">modifierMember</a></li>
+      <li class="inherited"><a href="fake/GenericMixin/overrideByBoth.html">overrideByBoth</a></li>
+      <li class="inherited"><a href="fake/GenericMixin/overrideByGenericMixin.html">overrideByGenericMixin</a></li>
+      <li class="inherited"><a href="fake/ModifierClass/overrideByModifierClass.html">overrideByModifierClass</a></li>
+      <li class="inherited"><a href="fake/GenericClass/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/TypeInferenceMixedIn-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/GenericClass/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/GenericClass/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/TypeInferenceMixedIn-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/GenericClass/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <h1>overrideByEverything property</h1>
+
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">overrideByEverything</span>
+          <div class="features">read / write</div>
+        </section>
+        <section class="desc markdown">
+          <p>Destined to be overridden by everything.</p>
+        </section>
+                
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs_dev/fake/TypedefUsingClass-class.html b/testing/test_package_docs_dev/fake/TypedefUsingClass-class.html
index ef8f669211..9aa533e659 100644
--- a/testing/test_package_docs_dev/fake/TypedefUsingClass-class.html
+++ b/testing/test_package_docs_dev/fake/TypedefUsingClass-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/UP-constant.html b/testing/test_package_docs_dev/fake/UP-constant.html
index d0564baa57..a471595979 100644
--- a/testing/test_package_docs_dev/fake/UP-constant.html
+++ b/testing/test_package_docs_dev/fake/UP-constant.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/VoidCallback.html b/testing/test_package_docs_dev/fake/VoidCallback.html
index 6ae946acdd..e6313ef4bf 100644
--- a/testing/test_package_docs_dev/fake/VoidCallback.html
+++ b/testing/test_package_docs_dev/fake/VoidCallback.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/WithGetterAndSetter-class.html b/testing/test_package_docs_dev/fake/WithGetterAndSetter-class.html
index 6b6541f818..a3cecc7d2c 100644
--- a/testing/test_package_docs_dev/fake/WithGetterAndSetter-class.html
+++ b/testing/test_package_docs_dev/fake/WithGetterAndSetter-class.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/ZERO-constant.html b/testing/test_package_docs_dev/fake/ZERO-constant.html
index 5d97d74a95..de683959d9 100644
--- a/testing/test_package_docs_dev/fake/ZERO-constant.html
+++ b/testing/test_package_docs_dev/fake/ZERO-constant.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/aCoolVariable.html b/testing/test_package_docs_dev/fake/aCoolVariable.html
index 093466907b..7a835a2615 100644
--- a/testing/test_package_docs_dev/fake/aCoolVariable.html
+++ b/testing/test_package_docs_dev/fake/aCoolVariable.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/aVoidParameter.html b/testing/test_package_docs_dev/fake/aVoidParameter.html
index 9627057c68..f860dd8f83 100644
--- a/testing/test_package_docs_dev/fake/aVoidParameter.html
+++ b/testing/test_package_docs_dev/fake/aVoidParameter.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/addCallback.html b/testing/test_package_docs_dev/fake/addCallback.html
index f7c22d0d8b..cad6bfe8eb 100644
--- a/testing/test_package_docs_dev/fake/addCallback.html
+++ b/testing/test_package_docs_dev/fake/addCallback.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/addCallback2.html b/testing/test_package_docs_dev/fake/addCallback2.html
index 03917fde7d..fa98a3f2f4 100644
--- a/testing/test_package_docs_dev/fake/addCallback2.html
+++ b/testing/test_package_docs_dev/fake/addCallback2.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/bulletDoced-constant.html b/testing/test_package_docs_dev/fake/bulletDoced-constant.html
index b4158fe434..ffdb9ac303 100644
--- a/testing/test_package_docs_dev/fake/bulletDoced-constant.html
+++ b/testing/test_package_docs_dev/fake/bulletDoced-constant.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/complicatedReturn.html b/testing/test_package_docs_dev/fake/complicatedReturn.html
index cc0fcdc7de..11e69ef63e 100644
--- a/testing/test_package_docs_dev/fake/complicatedReturn.html
+++ b/testing/test_package_docs_dev/fake/complicatedReturn.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/dynamicGetter.html b/testing/test_package_docs_dev/fake/dynamicGetter.html
index 0ec4826ab5..e587e0a86d 100644
--- a/testing/test_package_docs_dev/fake/dynamicGetter.html
+++ b/testing/test_package_docs_dev/fake/dynamicGetter.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/fake-library.html b/testing/test_package_docs_dev/fake/fake-library.html
index 8bf037b392..6fa1ba5ea6 100644
--- a/testing/test_package_docs_dev/fake/fake-library.html
+++ b/testing/test_package_docs_dev/fake/fake-library.html
@@ -104,6 +104,12 @@ <h2>Classes</h2>
         <dd>
           Verify super-mixins don't break Dartdoc.
         </dd>
+        <dt id="AClassUsingNewStyleMixin">
+          <span class="name "><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></span> 
+        </dt>
+        <dd>
+          A class mixing in a single new-style mixin.
+        </dd>
         <dt id="AClassWithFancyProperties">
           <span class="name "><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></span> 
         </dt>
@@ -208,6 +214,12 @@ <h2>Classes</h2>
         <dd>
           link to method from class <a href="ex/Apple/m.html">Apple.m</a>
         </dd>
+        <dt id="GenericClass">
+          <span class="name "><a href="fake/GenericClass-class.html">GenericClass</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span> 
+        </dt>
+        <dd>
+          A generic class for testing type inference.
+        </dd>
         <dt id="HasGenerics">
           <span class="name "><a href="fake/HasGenerics-class.html">HasGenerics</a><span class="signature">&lt;<wbr><span class="type-parameter">X</span>, <span class="type-parameter">Y</span>, <span class="type-parameter">Z</span>&gt;</span></span> 
         </dt>
@@ -315,6 +327,12 @@ <h2>Classes</h2>
         <dd>
           Perfect for mix-ins.
         </dd>
+        <dt id="ModifierClass">
+          <span class="name "><a href="fake/ModifierClass-class.html">ModifierClass</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span> 
+        </dt>
+        <dd>
+          A class extending a generic class.
+        </dd>
         <dt id="NotAMixin">
           <span class="name "><a href="fake/NotAMixin-class.html">NotAMixin</a></span> 
         </dt>
@@ -362,6 +380,12 @@ <h2>Classes</h2>
         </dt>
         <dd>
           
+        </dd>
+        <dt id="TypeInferenceMixedIn">
+          <span class="name "><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></span> 
+        </dt>
+        <dd>
+          A class verifying type inference across new-style mixins.
         </dd>
         <dt id="WithGetterAndSetter">
           <span class="name "><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></span> 
@@ -372,6 +396,25 @@ <h2>Classes</h2>
       </dl>
     </section>
 
+    <section class="summary offset-anchor" id="mixins">
+      <h2>Mixins</h2>
+
+      <dl>
+        <dt id="GenericMixin">
+          <span class="name "><a href="fake/GenericMixin-mixin.html">GenericMixin</a><span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span></span> 
+        </dt>
+        <dd>
+          A generic mixin that requires GenericClass as a superclass.
+        </dd>
+        <dt id="NewStyleMixinCallingSuper">
+          <span class="name "><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></span> 
+        </dt>
+        <dd>
+          I am a new style mixin using the new mixin syntax.
+        </dd>
+      </dl>
+    </section>
+
     <section class="summary offset-anchor" id="constants">
       <h2>Constants</h2>
 
@@ -970,6 +1013,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -987,6 +1031,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -1004,6 +1049,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -1012,8 +1058,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/functionWithFunctionParameters.html b/testing/test_package_docs_dev/fake/functionWithFunctionParameters.html
index c3a0e73da4..3d1af8dca2 100644
--- a/testing/test_package_docs_dev/fake/functionWithFunctionParameters.html
+++ b/testing/test_package_docs_dev/fake/functionWithFunctionParameters.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/getterSetterNodocGetter.html b/testing/test_package_docs_dev/fake/getterSetterNodocGetter.html
index 8b2f31ec6f..fc39fcefcb 100644
--- a/testing/test_package_docs_dev/fake/getterSetterNodocGetter.html
+++ b/testing/test_package_docs_dev/fake/getterSetterNodocGetter.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/getterSetterNodocSetter.html b/testing/test_package_docs_dev/fake/getterSetterNodocSetter.html
index 4b1ef63dbf..5c8b64193c 100644
--- a/testing/test_package_docs_dev/fake/getterSetterNodocSetter.html
+++ b/testing/test_package_docs_dev/fake/getterSetterNodocSetter.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/greatAnnotation-constant.html b/testing/test_package_docs_dev/fake/greatAnnotation-constant.html
index 5c0a74706e..1b8614f657 100644
--- a/testing/test_package_docs_dev/fake/greatAnnotation-constant.html
+++ b/testing/test_package_docs_dev/fake/greatAnnotation-constant.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/greatestAnnotation-constant.html b/testing/test_package_docs_dev/fake/greatestAnnotation-constant.html
index 84982871b9..f337227d5c 100644
--- a/testing/test_package_docs_dev/fake/greatestAnnotation-constant.html
+++ b/testing/test_package_docs_dev/fake/greatestAnnotation-constant.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/importantComputations.html b/testing/test_package_docs_dev/fake/importantComputations.html
index 7b3bdc7207..72f7d661ab 100644
--- a/testing/test_package_docs_dev/fake/importantComputations.html
+++ b/testing/test_package_docs_dev/fake/importantComputations.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/incorrectDocReference-constant.html b/testing/test_package_docs_dev/fake/incorrectDocReference-constant.html
index 18c059e768..3b1f308aa7 100644
--- a/testing/test_package_docs_dev/fake/incorrectDocReference-constant.html
+++ b/testing/test_package_docs_dev/fake/incorrectDocReference-constant.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/justGetter.html b/testing/test_package_docs_dev/fake/justGetter.html
index 70314b8eaa..2de38dfacd 100644
--- a/testing/test_package_docs_dev/fake/justGetter.html
+++ b/testing/test_package_docs_dev/fake/justGetter.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/justSetter.html b/testing/test_package_docs_dev/fake/justSetter.html
index 24ee98ffcc..f815d7bb95 100644
--- a/testing/test_package_docs_dev/fake/justSetter.html
+++ b/testing/test_package_docs_dev/fake/justSetter.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/mapWithDynamicKeys.html b/testing/test_package_docs_dev/fake/mapWithDynamicKeys.html
index 55037fb4f7..feb952d56a 100644
--- a/testing/test_package_docs_dev/fake/mapWithDynamicKeys.html
+++ b/testing/test_package_docs_dev/fake/mapWithDynamicKeys.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/meaningOfLife.html b/testing/test_package_docs_dev/fake/meaningOfLife.html
index 1807eec8f4..274ccfcac7 100644
--- a/testing/test_package_docs_dev/fake/meaningOfLife.html
+++ b/testing/test_package_docs_dev/fake/meaningOfLife.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/mustGetThis.html b/testing/test_package_docs_dev/fake/mustGetThis.html
index 368f633f9d..08c8e2eb02 100644
--- a/testing/test_package_docs_dev/fake/mustGetThis.html
+++ b/testing/test_package_docs_dev/fake/mustGetThis.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/myCoolTypedef.html b/testing/test_package_docs_dev/fake/myCoolTypedef.html
index d532e9caef..23af06e081 100644
--- a/testing/test_package_docs_dev/fake/myCoolTypedef.html
+++ b/testing/test_package_docs_dev/fake/myCoolTypedef.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/myGenericFunction.html b/testing/test_package_docs_dev/fake/myGenericFunction.html
index 7a2e92b988..57e4423f39 100644
--- a/testing/test_package_docs_dev/fake/myGenericFunction.html
+++ b/testing/test_package_docs_dev/fake/myGenericFunction.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/myMap-constant.html b/testing/test_package_docs_dev/fake/myMap-constant.html
index 861751248d..4184cf9eba 100644
--- a/testing/test_package_docs_dev/fake/myMap-constant.html
+++ b/testing/test_package_docs_dev/fake/myMap-constant.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/onlyPositionalWithNoDefaultNoType.html b/testing/test_package_docs_dev/fake/onlyPositionalWithNoDefaultNoType.html
index b7d81b45f9..704ccca961 100644
--- a/testing/test_package_docs_dev/fake/onlyPositionalWithNoDefaultNoType.html
+++ b/testing/test_package_docs_dev/fake/onlyPositionalWithNoDefaultNoType.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/paintImage1.html b/testing/test_package_docs_dev/fake/paintImage1.html
index 2a0e89410e..0273ff85d6 100644
--- a/testing/test_package_docs_dev/fake/paintImage1.html
+++ b/testing/test_package_docs_dev/fake/paintImage1.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/paintImage2.html b/testing/test_package_docs_dev/fake/paintImage2.html
index 60848b9b10..54caff3147 100644
--- a/testing/test_package_docs_dev/fake/paintImage2.html
+++ b/testing/test_package_docs_dev/fake/paintImage2.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/paramFromAnotherLib.html b/testing/test_package_docs_dev/fake/paramFromAnotherLib.html
index 1afdd83815..29d7652297 100644
--- a/testing/test_package_docs_dev/fake/paramFromAnotherLib.html
+++ b/testing/test_package_docs_dev/fake/paramFromAnotherLib.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/paramOfFutureOrNull.html b/testing/test_package_docs_dev/fake/paramOfFutureOrNull.html
index 3cc766057b..858aced811 100644
--- a/testing/test_package_docs_dev/fake/paramOfFutureOrNull.html
+++ b/testing/test_package_docs_dev/fake/paramOfFutureOrNull.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/required-constant.html b/testing/test_package_docs_dev/fake/required-constant.html
index bd6e264ea1..eaa01ec2bb 100644
--- a/testing/test_package_docs_dev/fake/required-constant.html
+++ b/testing/test_package_docs_dev/fake/required-constant.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/returningFutureVoid.html b/testing/test_package_docs_dev/fake/returningFutureVoid.html
index 1b20e89c2d..8a69ec420c 100644
--- a/testing/test_package_docs_dev/fake/returningFutureVoid.html
+++ b/testing/test_package_docs_dev/fake/returningFutureVoid.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/setAndGet.html b/testing/test_package_docs_dev/fake/setAndGet.html
index 56dca5d1e8..d955a32681 100644
--- a/testing/test_package_docs_dev/fake/setAndGet.html
+++ b/testing/test_package_docs_dev/fake/setAndGet.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/short.html b/testing/test_package_docs_dev/fake/short.html
index 0b01646d2a..171e369c08 100644
--- a/testing/test_package_docs_dev/fake/short.html
+++ b/testing/test_package_docs_dev/fake/short.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/simpleProperty.html b/testing/test_package_docs_dev/fake/simpleProperty.html
index 9dbbcc8a1d..d56e93019c 100644
--- a/testing/test_package_docs_dev/fake/simpleProperty.html
+++ b/testing/test_package_docs_dev/fake/simpleProperty.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/soIntense.html b/testing/test_package_docs_dev/fake/soIntense.html
index cf3c5c582c..47f551034c 100644
--- a/testing/test_package_docs_dev/fake/soIntense.html
+++ b/testing/test_package_docs_dev/fake/soIntense.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/testingCodeSyntaxInOneLiners-constant.html b/testing/test_package_docs_dev/fake/testingCodeSyntaxInOneLiners-constant.html
index ccc0d9d9ef..46fb48bef5 100644
--- a/testing/test_package_docs_dev/fake/testingCodeSyntaxInOneLiners-constant.html
+++ b/testing/test_package_docs_dev/fake/testingCodeSyntaxInOneLiners-constant.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/thisIsAlsoAsync.html b/testing/test_package_docs_dev/fake/thisIsAlsoAsync.html
index 449597a8db..eb8a92d34d 100644
--- a/testing/test_package_docs_dev/fake/thisIsAlsoAsync.html
+++ b/testing/test_package_docs_dev/fake/thisIsAlsoAsync.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/thisIsAsync.html b/testing/test_package_docs_dev/fake/thisIsAsync.html
index d060d2ee0a..6c59901487 100644
--- a/testing/test_package_docs_dev/fake/thisIsAsync.html
+++ b/testing/test_package_docs_dev/fake/thisIsAsync.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/thisIsFutureOr.html b/testing/test_package_docs_dev/fake/thisIsFutureOr.html
index e629db8ee4..fca5854ad1 100644
--- a/testing/test_package_docs_dev/fake/thisIsFutureOr.html
+++ b/testing/test_package_docs_dev/fake/thisIsFutureOr.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/thisIsFutureOrNull.html b/testing/test_package_docs_dev/fake/thisIsFutureOrNull.html
index 88f132eaa3..0c4e0905c0 100644
--- a/testing/test_package_docs_dev/fake/thisIsFutureOrNull.html
+++ b/testing/test_package_docs_dev/fake/thisIsFutureOrNull.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/thisIsFutureOrT.html b/testing/test_package_docs_dev/fake/thisIsFutureOrT.html
index 8b444ae7da..222d02164a 100644
--- a/testing/test_package_docs_dev/fake/thisIsFutureOrT.html
+++ b/testing/test_package_docs_dev/fake/thisIsFutureOrT.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/topLevelFunction.html b/testing/test_package_docs_dev/fake/topLevelFunction.html
index de1dcaaa1c..42c64109c0 100644
--- a/testing/test_package_docs_dev/fake/topLevelFunction.html
+++ b/testing/test_package_docs_dev/fake/topLevelFunction.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/typeParamOfFutureOr.html b/testing/test_package_docs_dev/fake/typeParamOfFutureOr.html
index 296dc361a6..2e8d848f84 100644
--- a/testing/test_package_docs_dev/fake/typeParamOfFutureOr.html
+++ b/testing/test_package_docs_dev/fake/typeParamOfFutureOr.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/useSomethingInAnotherPackage.html b/testing/test_package_docs_dev/fake/useSomethingInAnotherPackage.html
index 9100519e54..5991677eba 100644
--- a/testing/test_package_docs_dev/fake/useSomethingInAnotherPackage.html
+++ b/testing/test_package_docs_dev/fake/useSomethingInAnotherPackage.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/fake/useSomethingInTheSdk.html b/testing/test_package_docs_dev/fake/useSomethingInTheSdk.html
index 73484d18e8..8eeb664346 100644
--- a/testing/test_package_docs_dev/fake/useSomethingInTheSdk.html
+++ b/testing/test_package_docs_dev/fake/useSomethingInTheSdk.html
@@ -41,6 +41,7 @@ <h5>fake library</h5>
       <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
       <li><a href="fake/ABaseClass-class.html">ABaseClass</a></li>
       <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AClassUsingNewStyleMixin-class.html">AClassUsingNewStyleMixin</a></li>
       <li><a href="fake/AClassWithFancyProperties-class.html">AClassWithFancyProperties</a></li>
       <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
       <li><a href="fake/Annotation-class.html">Annotation</a></li>
@@ -58,6 +59,7 @@ <h5>fake library</h5>
       <li><a href="fake/ExtendsFutureVoid-class.html">ExtendsFutureVoid</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/GenericClass-class.html">GenericClass</a></li>
       <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
       <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
       <li><a href="fake/HasPragma-class.html">HasPragma</a></li>
@@ -75,6 +77,7 @@ <h5>fake library</h5>
       <li><a href="fake/MIEEMixinWithOverride-class.html">MIEEMixinWithOverride</a></li>
       <li><a href="fake/MIEEThing-class.html">MIEEThing</a></li>
       <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/ModifierClass-class.html">ModifierClass</a></li>
       <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
       <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
       <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
@@ -83,8 +86,13 @@ <h5>fake library</h5>
       <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
       <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
       <li><a href="fake/TypedefUsingClass-class.html">TypedefUsingClass</a></li>
+      <li><a href="fake/TypeInferenceMixedIn-class.html">TypeInferenceMixedIn</a></li>
       <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
     
+      <li class="section-title"><a href="fake/fake-library.html#mixins">Mixins</a></li>
+      <li><a href="fake/GenericMixin-mixin.html">GenericMixin</a></li>
+      <li><a href="fake/NewStyleMixinCallingSuper-mixin.html">NewStyleMixinCallingSuper</a></li>
+    
       <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
       <li><a href="fake/bulletDoced-constant.html">bulletDoced</a></li>
       <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
diff --git a/testing/test_package_docs_dev/index.json b/testing/test_package_docs_dev/index.json
index 184c8d98be..cc833e79c8 100644
--- a/testing/test_package_docs_dev/index.json
+++ b/testing/test_package_docs_dev/index.json
@@ -4055,6 +4055,28 @@
    "type": "class"
   }
  },
+ {
+  "name": "AClassUsingNewStyleMixin",
+  "qualifiedName": "fake.AClassUsingNewStyleMixin",
+  "href": "fake/AClassUsingNewStyleMixin-class.html",
+  "type": "class",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "fake",
+   "type": "library"
+  }
+ },
+ {
+  "name": "AClassUsingNewStyleMixin",
+  "qualifiedName": "fake.AClassUsingNewStyleMixin",
+  "href": "fake/AClassUsingNewStyleMixin/AClassUsingNewStyleMixin.html",
+  "type": "constructor",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "AClassUsingNewStyleMixin",
+   "type": "class"
+  }
+ },
  {
   "name": "AClassWithFancyProperties",
   "qualifiedName": "fake.AClassWithFancyProperties",
@@ -5705,6 +5727,204 @@
    "type": "class"
   }
  },
+ {
+  "name": "GenericClass",
+  "qualifiedName": "fake.GenericClass",
+  "href": "fake/GenericClass-class.html",
+  "type": "class",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "fake",
+   "type": "library"
+  }
+ },
+ {
+  "name": "GenericClass",
+  "qualifiedName": "fake.GenericClass",
+  "href": "fake/GenericClass/GenericClass.html",
+  "type": "constructor",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "GenericClass",
+   "type": "class"
+  }
+ },
+ {
+  "name": "operator ==",
+  "qualifiedName": "fake.GenericClass.==",
+  "href": "fake/GenericClass/operator_equals.html",
+  "type": "method",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "GenericClass",
+   "type": "class"
+  }
+ },
+ {
+  "name": "hashCode",
+  "qualifiedName": "fake.GenericClass.hashCode",
+  "href": "fake/GenericClass/hashCode.html",
+  "type": "property",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "GenericClass",
+   "type": "class"
+  }
+ },
+ {
+  "name": "member",
+  "qualifiedName": "fake.GenericClass.member",
+  "href": "fake/GenericClass/member.html",
+  "type": "property",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "GenericClass",
+   "type": "class"
+  }
+ },
+ {
+  "name": "noSuchMethod",
+  "qualifiedName": "fake.GenericClass.noSuchMethod",
+  "href": "fake/GenericClass/noSuchMethod.html",
+  "type": "method",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "GenericClass",
+   "type": "class"
+  }
+ },
+ {
+  "name": "overrideByBoth",
+  "qualifiedName": "fake.GenericClass.overrideByBoth",
+  "href": "fake/GenericClass/overrideByBoth.html",
+  "type": "property",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "GenericClass",
+   "type": "class"
+  }
+ },
+ {
+  "name": "overrideByEverything",
+  "qualifiedName": "fake.GenericClass.overrideByEverything",
+  "href": "fake/GenericClass/overrideByEverything.html",
+  "type": "property",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "GenericClass",
+   "type": "class"
+  }
+ },
+ {
+  "name": "overrideByGenericMixin",
+  "qualifiedName": "fake.GenericClass.overrideByGenericMixin",
+  "href": "fake/GenericClass/overrideByGenericMixin.html",
+  "type": "property",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "GenericClass",
+   "type": "class"
+  }
+ },
+ {
+  "name": "overrideByModifierClass",
+  "qualifiedName": "fake.GenericClass.overrideByModifierClass",
+  "href": "fake/GenericClass/overrideByModifierClass.html",
+  "type": "property",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "GenericClass",
+   "type": "class"
+  }
+ },
+ {
+  "name": "runtimeType",
+  "qualifiedName": "fake.GenericClass.runtimeType",
+  "href": "fake/GenericClass/runtimeType.html",
+  "type": "property",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "GenericClass",
+   "type": "class"
+  }
+ },
+ {
+  "name": "toString",
+  "qualifiedName": "fake.GenericClass.toString",
+  "href": "fake/GenericClass/toString.html",
+  "type": "method",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "GenericClass",
+   "type": "class"
+  }
+ },
+ {
+  "name": "GenericMixin",
+  "qualifiedName": "fake.GenericMixin",
+  "href": "fake/GenericMixin/GenericMixin.html",
+  "type": "constructor",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "GenericMixin",
+   "type": "mixin"
+  }
+ },
+ {
+  "name": "GenericMixin",
+  "qualifiedName": "fake.GenericMixin",
+  "href": "fake/GenericMixin-mixin.html",
+  "type": "mixin",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "fake",
+   "type": "library"
+  }
+ },
+ {
+  "name": "mixinMember",
+  "qualifiedName": "fake.GenericMixin.mixinMember",
+  "href": "fake/GenericMixin/mixinMember.html",
+  "type": "property",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "GenericMixin",
+   "type": "mixin"
+  }
+ },
+ {
+  "name": "overrideByBoth",
+  "qualifiedName": "fake.GenericMixin.overrideByBoth",
+  "href": "fake/GenericMixin/overrideByBoth.html",
+  "type": "property",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "GenericMixin",
+   "type": "mixin"
+  }
+ },
+ {
+  "name": "overrideByEverything",
+  "qualifiedName": "fake.GenericMixin.overrideByEverything",
+  "href": "fake/GenericMixin/overrideByEverything.html",
+  "type": "property",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "GenericMixin",
+   "type": "mixin"
+  }
+ },
+ {
+  "name": "overrideByGenericMixin",
+  "qualifiedName": "fake.GenericMixin.overrideByGenericMixin",
+  "href": "fake/GenericMixin/overrideByGenericMixin.html",
+  "type": "property",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "GenericMixin",
+   "type": "mixin"
+  }
+ },
  {
   "name": "GenericTypedef",
   "qualifiedName": "fake.GenericTypedef",
@@ -7036,6 +7256,72 @@
    "type": "class"
   }
  },
+ {
+  "name": "ModifierClass",
+  "qualifiedName": "fake.ModifierClass",
+  "href": "fake/ModifierClass-class.html",
+  "type": "class",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "fake",
+   "type": "library"
+  }
+ },
+ {
+  "name": "ModifierClass",
+  "qualifiedName": "fake.ModifierClass",
+  "href": "fake/ModifierClass/ModifierClass.html",
+  "type": "constructor",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "ModifierClass",
+   "type": "class"
+  }
+ },
+ {
+  "name": "modifierMember",
+  "qualifiedName": "fake.ModifierClass.modifierMember",
+  "href": "fake/ModifierClass/modifierMember.html",
+  "type": "property",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "ModifierClass",
+   "type": "class"
+  }
+ },
+ {
+  "name": "overrideByBoth",
+  "qualifiedName": "fake.ModifierClass.overrideByBoth",
+  "href": "fake/ModifierClass/overrideByBoth.html",
+  "type": "property",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "ModifierClass",
+   "type": "class"
+  }
+ },
+ {
+  "name": "overrideByEverything",
+  "qualifiedName": "fake.ModifierClass.overrideByEverything",
+  "href": "fake/ModifierClass/overrideByEverything.html",
+  "type": "property",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "ModifierClass",
+   "type": "class"
+  }
+ },
+ {
+  "name": "overrideByModifierClass",
+  "qualifiedName": "fake.ModifierClass.overrideByModifierClass",
+  "href": "fake/ModifierClass/overrideByModifierClass.html",
+  "type": "property",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "ModifierClass",
+   "type": "class"
+  }
+ },
  {
   "name": "NAME_SINGLEUNDERSCORE",
   "qualifiedName": "fake.NAME_SINGLEUNDERSCORE",
@@ -7069,6 +7355,39 @@
    "type": "library"
   }
  },
+ {
+  "name": "NewStyleMixinCallingSuper",
+  "qualifiedName": "fake.NewStyleMixinCallingSuper",
+  "href": "fake/NewStyleMixinCallingSuper/NewStyleMixinCallingSuper.html",
+  "type": "constructor",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "NewStyleMixinCallingSuper",
+   "type": "mixin"
+  }
+ },
+ {
+  "name": "NewStyleMixinCallingSuper",
+  "qualifiedName": "fake.NewStyleMixinCallingSuper",
+  "href": "fake/NewStyleMixinCallingSuper-mixin.html",
+  "type": "mixin",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "fake",
+   "type": "library"
+  }
+ },
+ {
+  "name": "superString",
+  "qualifiedName": "fake.NewStyleMixinCallingSuper.superString",
+  "href": "fake/NewStyleMixinCallingSuper/superString.html",
+  "type": "property",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "NewStyleMixinCallingSuper",
+   "type": "mixin"
+  }
+ },
  {
   "name": "NotAMixin",
   "qualifiedName": "fake.NotAMixin",
@@ -8367,6 +8686,39 @@
    "type": "class"
   }
  },
+ {
+  "name": "TypeInferenceMixedIn",
+  "qualifiedName": "fake.TypeInferenceMixedIn",
+  "href": "fake/TypeInferenceMixedIn-class.html",
+  "type": "class",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "fake",
+   "type": "library"
+  }
+ },
+ {
+  "name": "TypeInferenceMixedIn",
+  "qualifiedName": "fake.TypeInferenceMixedIn",
+  "href": "fake/TypeInferenceMixedIn/TypeInferenceMixedIn.html",
+  "type": "constructor",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "TypeInferenceMixedIn",
+   "type": "class"
+  }
+ },
+ {
+  "name": "overrideByEverything",
+  "qualifiedName": "fake.TypeInferenceMixedIn.overrideByEverything",
+  "href": "fake/TypeInferenceMixedIn/overrideByEverything.html",
+  "type": "property",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "TypeInferenceMixedIn",
+   "type": "class"
+  }
+ },
  {
   "name": "TypedefUsingClass",
   "qualifiedName": "fake.TypedefUsingClass",
diff --git a/testing/test_package_docs_dev/is_deprecated/is_deprecated-library.html b/testing/test_package_docs_dev/is_deprecated/is_deprecated-library.html
index 4cac1680f9..837854db58 100644
--- a/testing/test_package_docs_dev/is_deprecated/is_deprecated-library.html
+++ b/testing/test_package_docs_dev/is_deprecated/is_deprecated-library.html
@@ -76,6 +76,7 @@ <h1>is_deprecated library </h1>
 
 
 
+
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
@@ -87,6 +88,7 @@ <h5>is_deprecated library</h5>
     
     
     
+    
     </ol>
   </div><!--/sidebar-offcanvas-right-->
 
diff --git a/testing/test_package_docs_dev/reexport_one/SomeOtherClass-class.html b/testing/test_package_docs_dev/reexport_one/SomeOtherClass-class.html
index 6974015a20..e715879943 100644
--- a/testing/test_package_docs_dev/reexport_one/SomeOtherClass-class.html
+++ b/testing/test_package_docs_dev/reexport_one/SomeOtherClass-class.html
@@ -49,6 +49,7 @@ <h5>reexport_one library</h5>
     
     
     
+    
     </ol>
   </div>
 
diff --git a/testing/test_package_docs_dev/reexport_one/reexport_one-library.html b/testing/test_package_docs_dev/reexport_one/reexport_one-library.html
index f21f42c9c5..aa8a8c98ef 100644
--- a/testing/test_package_docs_dev/reexport_one/reexport_one-library.html
+++ b/testing/test_package_docs_dev/reexport_one/reexport_one-library.html
@@ -107,6 +107,7 @@ <h2>Classes</h2>
 
 
 
+
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
@@ -123,6 +124,7 @@ <h5>reexport_one library</h5>
     
     
     
+    
     </ol>
   </div><!--/sidebar-offcanvas-right-->
 
diff --git a/testing/test_package_docs_dev/reexport_two/AUnicornClass-class.html b/testing/test_package_docs_dev/reexport_two/AUnicornClass-class.html
index 5b7a42df18..c773478936 100644
--- a/testing/test_package_docs_dev/reexport_two/AUnicornClass-class.html
+++ b/testing/test_package_docs_dev/reexport_two/AUnicornClass-class.html
@@ -49,6 +49,7 @@ <h5>reexport_two library</h5>
     
     
     
+    
     </ol>
   </div>
 
diff --git a/testing/test_package_docs_dev/reexport_two/SomeClass-class.html b/testing/test_package_docs_dev/reexport_two/SomeClass-class.html
index 2cff883f72..027dee4024 100644
--- a/testing/test_package_docs_dev/reexport_two/SomeClass-class.html
+++ b/testing/test_package_docs_dev/reexport_two/SomeClass-class.html
@@ -49,6 +49,7 @@ <h5>reexport_two library</h5>
     
     
     
+    
     </ol>
   </div>
 
diff --git a/testing/test_package_docs_dev/reexport_two/YetAnotherClass-class.html b/testing/test_package_docs_dev/reexport_two/YetAnotherClass-class.html
index e9153f403c..8b6ce764d1 100644
--- a/testing/test_package_docs_dev/reexport_two/YetAnotherClass-class.html
+++ b/testing/test_package_docs_dev/reexport_two/YetAnotherClass-class.html
@@ -49,6 +49,7 @@ <h5>reexport_two library</h5>
     
     
     
+    
     </ol>
   </div>
 
diff --git a/testing/test_package_docs_dev/reexport_two/reexport_two-library.html b/testing/test_package_docs_dev/reexport_two/reexport_two-library.html
index e09900e665..73dfe7ef7a 100644
--- a/testing/test_package_docs_dev/reexport_two/reexport_two-library.html
+++ b/testing/test_package_docs_dev/reexport_two/reexport_two-library.html
@@ -107,6 +107,7 @@ <h2>Classes</h2>
 
 
 
+
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
@@ -123,6 +124,7 @@ <h5>reexport_two library</h5>
     
     
     
+    
     </ol>
   </div><!--/sidebar-offcanvas-right-->
 
diff --git a/testing/test_package_docs_dev/test_package_imported.main/Whataclass-class.html b/testing/test_package_docs_dev/test_package_imported.main/Whataclass-class.html
index 4d073ac567..f1e625f477 100644
--- a/testing/test_package_docs_dev/test_package_imported.main/Whataclass-class.html
+++ b/testing/test_package_docs_dev/test_package_imported.main/Whataclass-class.html
@@ -47,6 +47,7 @@ <h5>test_package_imported.main library</h5>
     
     
     
+    
     </ol>
   </div>
 
diff --git a/testing/test_package_docs_dev/test_package_imported.main/Whataclass2-class.html b/testing/test_package_docs_dev/test_package_imported.main/Whataclass2-class.html
index 0732e6e6c8..05306a1437 100644
--- a/testing/test_package_docs_dev/test_package_imported.main/Whataclass2-class.html
+++ b/testing/test_package_docs_dev/test_package_imported.main/Whataclass2-class.html
@@ -47,6 +47,7 @@ <h5>test_package_imported.main library</h5>
     
     
     
+    
     </ol>
   </div>
 
diff --git a/testing/test_package_docs_dev/test_package_imported.main/test_package_imported.main-library.html b/testing/test_package_docs_dev/test_package_imported.main/test_package_imported.main-library.html
index b402f96406..c73d180d6a 100644
--- a/testing/test_package_docs_dev/test_package_imported.main/test_package_imported.main-library.html
+++ b/testing/test_package_docs_dev/test_package_imported.main/test_package_imported.main-library.html
@@ -91,6 +91,7 @@ <h2>Classes</h2>
 
 
 
+
   </div> <!-- /.main-content -->
 
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
@@ -105,6 +106,7 @@ <h5>test_package_imported.main library</h5>
     
     
     
+    
     </ol>
   </div><!--/sidebar-offcanvas-right-->
 
diff --git a/testing/test_package_docs_dev/topics/Superb-topic.html b/testing/test_package_docs_dev/topics/Superb-topic.html
index c7288229da..f48e5bf66d 100644
--- a/testing/test_package_docs_dev/topics/Superb-topic.html
+++ b/testing/test_package_docs_dev/topics/Superb-topic.html
@@ -91,11 +91,13 @@ <h2>Classes</h2>
 
 
 
+
   </div> <!-- /.main-content -->
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
     <h5>Superb Topic</h5>
     <ol>
     
+    
       <li class="section-title"><a href="topics/Superb-topic.html#classes">Classes</a></li>
       <li><a href="fake/BaseForDocComments-class.html">BaseForDocComments</a></li>
     
diff --git a/testing/test_package_docs_dev/topics/Unreal-topic.html b/testing/test_package_docs_dev/topics/Unreal-topic.html
index fc33f2f3d3..52fc7cf02b 100644
--- a/testing/test_package_docs_dev/topics/Unreal-topic.html
+++ b/testing/test_package_docs_dev/topics/Unreal-topic.html
@@ -110,6 +110,7 @@ <h2>Classes</h2>
 
 
 
+
   </div> <!-- /.main-content -->
   <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
     <h5>Unreal Topic</h5>
@@ -118,6 +119,7 @@ <h5>Unreal Topic</h5>
       <li><a href="reexport_one/reexport_one-library.html">reexport_one</a></li>
       <li><a href="reexport_two/reexport_two-library.html">reexport_two</a></li>
     
+    
       <li class="section-title"><a href="topics/Unreal-topic.html#classes">Classes</a></li>
       <li><a href="fake/BaseForDocComments-class.html">BaseForDocComments</a></li>
     
diff --git a/testing/test_package_docs_dev/two_exports/BaseClass-class.html b/testing/test_package_docs_dev/two_exports/BaseClass-class.html
index 5c662180e7..e7878f8489 100644
--- a/testing/test_package_docs_dev/two_exports/BaseClass-class.html
+++ b/testing/test_package_docs_dev/two_exports/BaseClass-class.html
@@ -43,6 +43,7 @@ <h5>two_exports library</h5>
       <li><a href="two_exports/ExtendingClass-class.html">ExtendingClass</a></li>
     
     
+    
       <li class="section-title"><a href="two_exports/two_exports-library.html#properties">Properties</a></li>
       <li><a href="two_exports/topLevelVariable.html">topLevelVariable</a></li>
     
diff --git a/testing/test_package_docs_dev/two_exports/ExtendingClass-class.html b/testing/test_package_docs_dev/two_exports/ExtendingClass-class.html
index eeebb58c53..7bf40b2e1a 100644
--- a/testing/test_package_docs_dev/two_exports/ExtendingClass-class.html
+++ b/testing/test_package_docs_dev/two_exports/ExtendingClass-class.html
@@ -43,6 +43,7 @@ <h5>two_exports library</h5>
       <li><a href="two_exports/ExtendingClass-class.html">ExtendingClass</a></li>
     
     
+    
       <li class="section-title"><a href="two_exports/two_exports-library.html#properties">Properties</a></li>
       <li><a href="two_exports/topLevelVariable.html">topLevelVariable</a></li>
     
diff --git a/testing/test_package_docs_dev/two_exports/topLevelVariable.html b/testing/test_package_docs_dev/two_exports/topLevelVariable.html
index 2286b5481e..220c4ad814 100644
--- a/testing/test_package_docs_dev/two_exports/topLevelVariable.html
+++ b/testing/test_package_docs_dev/two_exports/topLevelVariable.html
@@ -43,6 +43,7 @@ <h5>two_exports library</h5>
       <li><a href="two_exports/ExtendingClass-class.html">ExtendingClass</a></li>
     
     
+    
       <li class="section-title"><a href="two_exports/two_exports-library.html#properties">Properties</a></li>
       <li><a href="two_exports/topLevelVariable.html">topLevelVariable</a></li>
     
diff --git a/testing/test_package_docs_dev/two_exports/two_exports-library.html b/testing/test_package_docs_dev/two_exports/two_exports-library.html
index 42083e07bb..37b012ac29 100644
--- a/testing/test_package_docs_dev/two_exports/two_exports-library.html
+++ b/testing/test_package_docs_dev/two_exports/two_exports-library.html
@@ -86,6 +86,7 @@ <h2>Classes</h2>
     </section>
 
 
+
     <section class="summary offset-anchor" id="properties">
       <h2>Properties</h2>
 
@@ -115,6 +116,7 @@ <h5>two_exports library</h5>
       <li><a href="two_exports/ExtendingClass-class.html">ExtendingClass</a></li>
     
     
+    
       <li class="section-title"><a href="two_exports/two_exports-library.html#properties">Properties</a></li>
       <li><a href="two_exports/topLevelVariable.html">topLevelVariable</a></li>
     
diff --git a/tool/grind.dart b/tool/grind.dart
index 781c7603d7..fd71b898a9 100644
--- a/tool/grind.dart
+++ b/tool/grind.dart
@@ -386,7 +386,19 @@ Future<String> createSdkDartdoc() async {
     sdkClone.path
   ]);
   File dartdocPubspec = new File(pathLib.join(dartdocSdk.path, 'pubspec.yaml'));
+  List<String> pubspecLines = await dartdocPubspec.readAsLines();
+  List<String> pubspecLinesFiltered = [];
+  for (String line in pubspecLines) {
+    if (line.startsWith('dependency_overrides:')) {
+      pubspecLinesFiltered.add('#dependency_overrides:');
+    } else {
+      pubspecLinesFiltered.add(line);
+    }
+  }
+
+  await dartdocPubspec.writeAsString(pubspecLinesFiltered.join('\n'));
   dartdocPubspec.writeAsStringSync('''
+
 dependency_overrides:
   analyzer:
     path: '${sdkClone.path}/pkg/analyzer'
@@ -395,7 +407,6 @@ dependency_overrides:
   kernel:
     path: '${sdkClone.path}/pkg/kernel'
 ''', mode: FileMode.append);
-
   await launcher.runStreamed(sdkBin('pub'), ['get'],
       workingDirectory: dartdocSdk.path);
   return dartdocSdk.path;
@@ -407,7 +418,8 @@ Future<void> testWithAnalyzerSdk() async {
   var sdkDartdoc = await createSdkDartdoc();
   final String defaultGrindParameter =
       Platform.environment['DARTDOC_GRIND_STEP'] ?? 'test';
-  await launcher.runStreamed(sdkBin('pub'), ['run', 'grinder', defaultGrindParameter],
+  await launcher.runStreamed(
+      sdkBin('pub'), ['run', 'grinder', defaultGrindParameter],
       workingDirectory: sdkDartdoc);
 }
 
@@ -794,8 +806,10 @@ Future<void> checkBuild() async {
 @Task('Dry run of publish to pub.dartlang')
 @Depends(checkChangelogHasVersion)
 Future<void> tryPublish() async {
-  var launcher = new SubprocessLauncher('try-publish');
-  await launcher.runStreamed(sdkBin('pub'), ['publish', '-n']);
+  log('FIXME:  tryPublish() disabled until dependency_override is removed'
+      ' (#1765)');
+  //var launcher = new SubprocessLauncher('try-publish');
+  //await launcher.runStreamed(sdkBin('pub'), ['publish', '-n']);
 }
 
 @Task('Run all the tests.')