Merge branch 'hotfix/2.1.19' v2.1.19
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 6 Jul 2016 15:44:51 +0000 (11:44 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 6 Jul 2016 15:44:51 +0000 (11:44 -0400)

Trivial merge