Merge branch 'hotfix/1.0.17' v1.0.17
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 3 Nov 2016 20:50:23 +0000 (16:50 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 3 Nov 2016 20:50:23 +0000 (16:50 -0400)

Trivial merge