Merge branch 'hotfix/1.0.19' v1.0.19
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 11 Mar 2016 16:14:15 +0000 (11:14 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 11 Mar 2016 16:14:15 +0000 (11:14 -0500)

Trivial merge