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

Trivial merge