Merge branch 'hotfix/1.1.99' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 16 Jun 2015 15:12:33 +0000 (11:12 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 16 Jun 2015 15:12:33 +0000 (11:12 -0400)

Trivial merge