Fixing multiple deployment listener issues
Merge remote-tracking branch 'upstream/develop' into fix_dl
Merge pull request #81 from lujameva/fix_dl

Fix various deployment listener issues