Merge branch 'hotfix/1.5.3' v1.5.3
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 19 Jul 2016 12:10:36 +0000 (08:10 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 19 Jul 2016 12:10:36 +0000 (08:10 -0400)

Trivial merge