Merge branch 'release/1.3.4' v1.3.4
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 11 Jun 2015 15:37:49 +0000 (11:37 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 11 Jun 2015 15:37:49 +0000 (11:37 -0400)

Trivial merge