Merge branch 'hotfix/1.5.3' v1.5.3
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 3 Nov 2016 17:58:20 +0000 (13:58 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 3 Nov 2016 17:58:20 +0000 (13:58 -0400)

Trivial merge