From: Fletcher T. Penney <fletcher@fletcherpenney.net>
Date: Sun, 9 Apr 2017 23:34:12 +0000 (-0400)
Subject: Merge branch 'release/6.0.4' into develop
X-Git-Tag: 6.0.5^2~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cdffbd4327940326418ae69855765af8fc0942e2;p=multimarkdown

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

cdffbd4327940326418ae69855765af8fc0942e2