Merge branch 'hotfix/2.4.1' v2.4.1
authorChuck Scott <cscott@gaslightmedia.com>
Mon, 8 Aug 2016 16:28:59 +0000 (12:28 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Mon, 8 Aug 2016 16:28:59 +0000 (12:28 -0400)

Trivial merge