Merge branch 'master' into dartdoc-0.28.7

Author: jcollins-g

lib/src/element_type.dart

@@ -447,7 +447,7 @@ class CallableGenericTypeAliasElementType extends ParameterizedElementType
   ElementType get returnType {
     if (_returnType == null) {
       _returnType = ElementType.from(
-          returnElement.modelType.type, library, packageGraph, this);
+          type.returnType, library, packageGraph, this);
     }
     return _returnType;
   }

test/dartdoc_integration_test.dart

@@ -69,7 +69,7 @@ void main() {
       expect(outputLines, contains(matches('^  warning:')));
       expect(outputLines.last, matches(r'^found \d+ warnings and \d+ errors'));
       expect(outputDir.listSync(), isNotEmpty);
-    });
+    }, timeout: new Timeout.factor(2));
 
     test('invalid parameters return non-zero and print a fatal-error',
         () async {