Merge branch 'hotfix/1.3.5'
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 14 Jul 2015 13:56:44 +0000 (09:56 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 14 Jul 2015 13:56:44 +0000 (09:56 -0400)

Trivial merge