diff --git a/composer.lock b/composer.lock
index ec8987951..2336c10ff 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,6 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "fe77eae7f153ec8d70ba905ae736c1f3",
     "content-hash": "db0fd420bda434d99cd25d69e6acf238",
     "packages": [
         {
@@ -68,7 +67,7 @@
                 "s3",
                 "sdk"
             ],
-            "time": "2016-07-25 18:03:20"
+            "time": "2016-07-25T18:03:20+00:00"
         },
         {
             "name": "composer/installers",
@@ -175,7 +174,7 @@
                 "zend",
                 "zikula"
             ],
-            "time": "2016-08-13 20:53:52"
+            "time": "2016-08-13T20:53:52+00:00"
         },
         {
             "name": "doctrine/cache",
@@ -245,7 +244,7 @@
                 "cache",
                 "caching"
             ],
-            "time": "2016-10-29 11:16:17"
+            "time": "2016-10-29T11:16:17+00:00"
         },
         {
             "name": "erusev/parsedown",
@@ -284,7 +283,7 @@
                 "markdown",
                 "parser"
             ],
-            "time": "2014-11-29 02:29:14"
+            "time": "2014-11-29T02:29:14+00:00"
         },
         {
             "name": "erusev/parsedown-extra",
@@ -328,7 +327,7 @@
                 "parsedown",
                 "parser"
             ],
-            "time": "2014-09-16 11:54:01"
+            "time": "2014-09-16T11:54:01+00:00"
         },
         {
             "name": "guzzle/guzzle",
@@ -424,7 +423,7 @@
                 "web service"
             ],
             "abandoned": "guzzlehttp/guzzle",
-            "time": "2015-03-18 18:23:50"
+            "time": "2015-03-18T18:23:50+00:00"
         },
         {
             "name": "mandrew/silverstripe-quickfeedback",
@@ -463,7 +462,41 @@
                 "member",
                 "silverstripe"
             ],
-            "time": "2016-02-18 04:32:50"
+            "time": "2016-02-18T04:32:50+00:00"
+        },
+        {
+            "name": "mnapoli/front-yaml",
+            "version": "1.5.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/mnapoli/FrontYAML.git",
+                "reference": "f10c1dfee1604d15c2b0ab6826eecc1111d65543"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/mnapoli/FrontYAML/zipball/f10c1dfee1604d15c2b0ab6826eecc1111d65543",
+                "reference": "f10c1dfee1604d15c2b0ab6826eecc1111d65543",
+                "shasum": ""
+            },
+            "require": {
+                "erusev/parsedown": "~1.0",
+                "symfony/yaml": "~2.1|^3.0"
+            },
+            "require-dev": {
+                "league/commonmark": "~0.7",
+                "phpunit/phpunit": "~4.5"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Mni\\FrontYAML\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "time": "2016-10-01T11:06:51+00:00"
         },
         {
             "name": "mtdowling/cron-expression",
@@ -507,7 +540,7 @@
                 "cron",
                 "schedule"
             ],
-            "time": "2016-01-26 21:23:30"
+            "time": "2016-01-26T21:23:30+00:00"
         },
         {
             "name": "silverstripe/crontask",
@@ -550,25 +583,26 @@
                 "cron",
                 "silverstripe"
             ],
-            "time": "2016-09-13 10:39:18"
+            "time": "2016-09-13T10:39:18+00:00"
         },
         {
             "name": "silverstripe/docsviewer",
-            "version": "2.0.0-beta5",
+            "version": "2.0.0-beta6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/silverstripe/silverstripe-docsviewer.git",
-                "reference": "ded5432ec0d6e2183c395ef4a98e7695c89d5112"
+                "reference": "4b618c139c6fdb614208b2e7621261411482829d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/silverstripe/silverstripe-docsviewer/zipball/ded5432ec0d6e2183c395ef4a98e7695c89d5112",
-                "reference": "ded5432ec0d6e2183c395ef4a98e7695c89d5112",
+                "url": "https://api.github.com/repos/silverstripe/silverstripe-docsviewer/zipball/4b618c139c6fdb614208b2e7621261411482829d",
+                "reference": "4b618c139c6fdb614208b2e7621261411482829d",
                 "shasum": ""
             },
             "require": {
                 "erusev/parsedown": "~1.1.0",
                 "erusev/parsedown-extra": "0.2.2",
+                "mnapoli/front-yaml": "^1.5",
                 "silverstripe/framework": "~3.1"
             },
             "suggest": {
@@ -591,7 +625,7 @@
                 "documentation",
                 "silverstripe"
             ],
-            "time": "2016-12-12 00:54:31"
+            "time": "2017-06-29T00:25:02+00:00"
         },
         {
             "name": "silverstripe/dynamodb",
@@ -632,7 +666,7 @@
                 "dynamodb",
                 "silverstripe"
             ],
-            "time": "2016-03-03 21:34:17"
+            "time": "2016-03-03T21:34:17+00:00"
         },
         {
             "name": "silverstripe/framework",
@@ -686,7 +720,7 @@
                 "framework",
                 "silverstripe"
             ],
-            "time": "2016-11-28 12:35:19"
+            "time": "2016-11-28T12:35:19+00:00"
         },
         {
             "name": "silverstripe/toolbar",
@@ -730,7 +764,7 @@
                 "source": "https://github.com/silverstripe/silverstripe-globaltoolbar/tree/4.2.0",
                 "issues": "https://github.com/silverstripe/silverstripe-globaltoolbar/issues"
             },
-            "time": "2016-10-14 02:05:33"
+            "time": "2016-10-14T02:05:33+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
@@ -790,7 +824,56 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
-            "time": "2016-10-13 01:43:15"
+            "time": "2016-10-13T01:43:15+00:00"
+        },
+        {
+            "name": "symfony/yaml",
+            "version": "v2.8.14",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/yaml.git",
+                "reference": "befb26a3713c97af90d25dd12e75621ef14d91ff"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/befb26a3713c97af90d25dd12e75621ef14d91ff",
+                "reference": "befb26a3713c97af90d25dd12e75621ef14d91ff",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Yaml\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Yaml Component",
+            "homepage": "https://symfony.com",
+            "time": "2016-11-14T16:15:57+00:00"
         },
         {
             "name": "unclecheese/display-logic",
@@ -834,7 +917,7 @@
                 "logic",
                 "silverstripe"
             ],
-            "time": "2016-06-21 00:24:32"
+            "time": "2016-06-21T00:24:32+00:00"
         }
     ],
     "packages-dev": [
@@ -897,7 +980,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2014-09-02 10:13:14"
+            "time": "2014-09-02T10:13:14+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -944,7 +1027,7 @@
                 "filesystem",
                 "iterator"
             ],
-            "time": "2016-10-03 07:40:28"
+            "time": "2016-10-03T07:40:28+00:00"
         },
         {
             "name": "phpunit/php-text-template",
@@ -985,7 +1068,7 @@
             "keywords": [
                 "template"
             ],
-            "time": "2015-06-21 13:50:34"
+            "time": "2015-06-21T13:50:34+00:00"
         },
         {
             "name": "phpunit/php-timer",
@@ -1029,7 +1112,7 @@
             "keywords": [
                 "timer"
             ],
-            "time": "2016-05-12 18:03:57"
+            "time": "2016-05-12T18:03:57+00:00"
         },
         {
             "name": "phpunit/php-token-stream",
@@ -1079,7 +1162,7 @@
             "keywords": [
                 "tokenizer"
             ],
-            "time": "2014-03-03 05:10:30"
+            "time": "2014-03-03T05:10:30+00:00"
         },
         {
             "name": "phpunit/phpunit",
@@ -1152,7 +1235,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2014-10-17 09:04:17"
+            "time": "2014-10-17T09:04:17+00:00"
         },
         {
             "name": "phpunit/phpunit-mock-objects",
@@ -1201,56 +1284,7 @@
                 "mock",
                 "xunit"
             ],
-            "time": "2013-01-13 10:24:48"
-        },
-        {
-            "name": "symfony/yaml",
-            "version": "v2.8.14",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/yaml.git",
-                "reference": "befb26a3713c97af90d25dd12e75621ef14d91ff"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/befb26a3713c97af90d25dd12e75621ef14d91ff",
-                "reference": "befb26a3713c97af90d25dd12e75621ef14d91ff",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.9"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.8-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Yaml\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Yaml Component",
-            "homepage": "https://symfony.com",
-            "time": "2016-11-14 16:15:57"
+            "time": "2013-01-13T10:24:48+00:00"
         }
     ],
     "aliases": [],