Merge branch 'hotfix/1.2.13' v1.2.13
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 24 Jul 2017 14:58:15 +0000 (10:58 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 24 Jul 2017 14:58:15 +0000 (10:58 -0400)

Trivial merge