From: Fletcher T. Penney <fletcher@fletcherpenney.net>
Date: Tue, 2 May 2017 22:48:56 +0000 (-0400)
Subject: Merge branch 'release/6.0.5' into develop
X-Git-Tag: 6.0.6^2~17
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=db1c4384d94a6dc30074dcd2a4c472194857b1e1;p=multimarkdown

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

db1c4384d94a6dc30074dcd2a4c472194857b1e1