Merge branch 'hotfix/1.0.18' v1.0.18
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 7 Oct 2016 19:25:04 +0000 (15:25 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 7 Oct 2016 19:25:04 +0000 (15:25 -0400)

Trivial merge