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

Trivial merge