Merge branch 'hotfix/1.3.7' v1.3.7
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 12 Sep 2016 19:17:51 +0000 (15:17 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 12 Sep 2016 19:17:51 +0000 (15:17 -0400)

Trivial merge