Merge branch 'hotfix/1.6.4' v1.6.4
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 17 Jan 2017 13:04:55 +0000 (08:04 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 17 Jan 2017 13:04:55 +0000 (08:04 -0500)

Trivial merge