Merge branch 'hotfix/1.6.17' v1.6.17
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 3 Mar 2017 13:56:44 +0000 (08:56 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 3 Mar 2017 13:56:44 +0000 (08:56 -0500)

Trivial merge