Merge branch 'hotfix/1.5.20' v1.5.20
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 7 Apr 2016 14:30:07 +0000 (10:30 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 7 Apr 2016 14:30:07 +0000 (10:30 -0400)

Trivial merge