Pull changes for getlantern/lantern#1946 into natty branch