Merge branch 'hotfix/1.0.17' v1.0.17
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 27 Apr 2017 18:39:10 +0000 (14:39 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 27 Apr 2017 18:39:10 +0000 (14:39 -0400)

Trivial merge