Merge branch 'hotfix/1.6.23' v1.6.23
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 8 Mar 2017 20:40:32 +0000 (15:40 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 8 Mar 2017 20:40:32 +0000 (15:40 -0500)

Trivial merge