Merge branch 'hotfix/1.0.19'
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 11 Jan 2016 14:22:12 +0000 (09:22 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 11 Jan 2016 14:22:12 +0000 (09:22 -0500)

Trivial merge