Merge branch 'hotfix/1.0.17' v1.0.17
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 14 Oct 2016 14:14:58 +0000 (10:14 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 14 Oct 2016 14:14:58 +0000 (10:14 -0400)

Trivial merge