Merge branch 'hotfix/1.0.20' v1.0.20
authorChuck Scott <cscott@gaslightmedia.com>
Mon, 13 Feb 2017 19:05:44 +0000 (14:05 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Mon, 13 Feb 2017 19:05:44 +0000 (14:05 -0500)

Trivial merge