Merge branch 'hotfix/1.3.8' v1.3.8
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 13 Sep 2016 13:26:37 +0000 (09:26 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 13 Sep 2016 13:26:37 +0000 (09:26 -0400)

Trivial merge