Merge branch 'hotfix/1.5.13' v1.5.13
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 4 May 2017 17:16:08 +0000 (13:16 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 4 May 2017 17:16:08 +0000 (13:16 -0400)

Trivial merge