Merge branch 'hotfix/1.1.15' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 24 Jul 2015 14:51:04 +0000 (10:51 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 24 Jul 2015 14:51:04 +0000 (10:51 -0400)

Trivial merge