Pull changes to fix getlantern/lantern#1895

Pull changes to fix getlantern/lantern#1895