Merge branch 'hotfix/1.6.16' v1.6.16
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 2 Mar 2017 21:33:25 +0000 (16:33 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 2 Mar 2017 21:33:25 +0000 (16:33 -0500)

Trivial merge