Merge branch 'hotfix/1.6.12' v1.6.12
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 2 Mar 2017 18:55:05 +0000 (13:55 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 2 Mar 2017 18:55:05 +0000 (13:55 -0500)

Trivial merge