Merge pull request #1896 from gnestor/mime-json-suffix

Accept JSON output data with mime type "application/*+json"

notebook/static/notebook/js/outputarea.js

@@ -275,7 +275,7 @@ define([
         }
         var data = bundle.data;
         $.map(OutputArea.output_types, function(key){
-            if (key !== 'application/json' &&
+            if ((key.indexOf('application/') === -1 || key.indexOf('json') === -1) &&
                 data[key] !== undefined &&
                 typeof data[key] !== 'string'
             ) {