Merge branch 'hotfix/2.3.1' v2.3.1
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 26 Jul 2016 15:08:09 +0000 (11:08 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 26 Jul 2016 15:08:09 +0000 (11:08 -0400)

Trivial merge