From: Fletcher T. Penney <fletcher@fletcherpenney.net>
Date: Sun, 19 Mar 2017 17:04:07 +0000 (-0400)
Subject: Merge branch 'release/6.0.0-rc2' into develop
X-Git-Tag: 6.0.0-rc3^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d29f0db710c31284a22ab9e040a6fc506738b1ca;p=multimarkdown

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

d29f0db710c31284a22ab9e040a6fc506738b1ca