Merge branch 'hotfix/1.1.15' v1.1.15
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 20 Nov 2015 13:12:31 +0000 (08:12 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 20 Nov 2015 13:12:31 +0000 (08:12 -0500)

Trivial merge