Merge branch 'hotfix/1.0.18'
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 11 Jan 2016 13:39:40 +0000 (08:39 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 11 Jan 2016 13:39:40 +0000 (08:39 -0500)

Trivial merge