Merge branch 'hotfix/1.1.97'
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 16 Jun 2015 14:39:05 +0000 (10:39 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 16 Jun 2015 14:39:05 +0000 (10:39 -0400)

Trivial merge