Merge branch 'hotfix/1.1.25' v1.1.25
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 22 Dec 2015 18:13:47 +0000 (13:13 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 22 Dec 2015 18:13:47 +0000 (13:13 -0500)

Trivial merge