Merge branch 'hotfix/1.1.20' v1.1.20
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 7 Feb 2017 19:47:12 +0000 (14:47 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 7 Feb 2017 19:47:12 +0000 (14:47 -0500)

Trivial merge