Merged devel
Merge branch 'master' of https://github.com/getlantern/lantern-common