Merge branch 'hotfix/1.3.4' v1.3.4
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 1 Sep 2016 15:32:31 +0000 (11:32 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 1 Sep 2016 15:32:31 +0000 (11:32 -0400)

Trivial merge