Merge branch 'hotfix/1.0.20' v1.0.20
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 12 Jan 2016 20:53:20 +0000 (15:53 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 12 Jan 2016 20:53:20 +0000 (15:53 -0500)

Trivial merge