Merged devel
Merge pull request #1663 from getlantern/dynamics3

Merged devel