From: Fletcher T. Penney <fletcher@fletcherpenney.net>
Date: Wed, 22 Mar 2017 23:55:33 +0000 (-0400)
Subject: Merge branch 'release/6.0.0' into develop
X-Git-Tag: 6.0.1^2~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=db1dd0a0e2225505d7e1b44b08eb4bb9fa36f041;p=multimarkdown

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

db1dd0a0e2225505d7e1b44b08eb4bb9fa36f041