Code review changes #2043
Merge branch '2043' of github.com:getlantern/lantern into 2043