From: Fletcher T. Penney <fletcher@fletcherpenney.net>
Date: Wed, 15 Mar 2017 15:44:35 +0000 (-0400)
Subject: Merge branch 'release/6.0.0-rc1' into develop
X-Git-Tag: 6.0.0-rc2^2~27
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2a86ac5921e22b069594287b35218c17a270ea97;p=multimarkdown

Merge branch 'release/6.0.0-rc1' into develop
---

2a86ac5921e22b069594287b35218c17a270ea97