Merge branch 'hotfix/1.6.21' v1.6.21
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 6 Mar 2017 20:09:50 +0000 (15:09 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 6 Mar 2017 20:09:50 +0000 (15:09 -0500)

Trivial merge