Merge branch 'hotfix/1.6.1' v1.6.1
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 10 Jan 2017 13:55:23 +0000 (08:55 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 10 Jan 2017 13:55:23 +0000 (08:55 -0500)

Trivial merge