Merge branch 'release/1.3.5' v1.3.5
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 14 Apr 2015 17:33:10 +0000 (13:33 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 14 Apr 2015 17:33:10 +0000 (13:33 -0400)

Trivial merge