Merge branch 'hotfix/1.0.17' v1.0.17
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 7 Jul 2016 13:11:01 +0000 (09:11 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 7 Jul 2016 13:11:01 +0000 (09:11 -0400)

Trivial merge