Merge branch 'hotfix/2.1.20' v2.1.20
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 6 Jul 2016 19:05:11 +0000 (15:05 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 6 Jul 2016 19:05:11 +0000 (15:05 -0400)

Trivial merge