Merge branch 'hotfix/1.0.20' v1.0.20
authorChuck Scott <cscott@gaslightmedia.com>
Fri, 16 Jun 2017 19:52:50 +0000 (15:52 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Fri, 16 Jun 2017 19:52:50 +0000 (15:52 -0400)

Trivial merge