Merge branch 'release/1.3.4' v1.3.4
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 14 Apr 2015 17:25:45 +0000 (13:25 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 14 Apr 2015 17:25:45 +0000 (13:25 -0400)

Trivial merge