Merge branch 'hotfix/1.6.20' v1.6.20
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 6 Mar 2017 19:55:16 +0000 (14:55 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 6 Mar 2017 19:55:16 +0000 (14:55 -0500)

Trivial merge