Merge branch 'hotfix/1.0.20' v1.0.20
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 21 Jan 2016 15:38:40 +0000 (10:38 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 21 Jan 2016 15:38:40 +0000 (10:38 -0500)

Trivial merge