Merge branch 'hotfix/1.6.13' v1.6.13
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 2 Mar 2017 19:15:09 +0000 (14:15 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 2 Mar 2017 19:15:09 +0000 (14:15 -0500)

Trivial merge