Merge branch 'hotfix/1.6.1' v1.6.1
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 16 Feb 2017 19:29:43 +0000 (14:29 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 16 Feb 2017 19:29:43 +0000 (14:29 -0500)

Trivial merge