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

Trivial merge