Merge branch 'hotfix/1.0.17'
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 8 Jan 2016 22:35:39 +0000 (17:35 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 8 Jan 2016 22:35:39 +0000 (17:35 -0500)

Trivial merge