Merge branch 'master' into t922

2 jobs for t922 in 11 minutes and 19 seconds (queued for 3 seconds)
Name Stage Failure
build-jessie Test
dpkg-source: warning: ignoring deletion of file octonet.egg-info/dependency_links.txt, use --include-removal to override
dpkg-source: info: local changes detected, the modified files are:
dpkg-source: error: aborting due to unexpected upstream changes, see /tmp/octonet_10.0.4-2.diff.GtMXVN
dpkg-source: info: you can integrate the local changes with dpkg-source --commit
dpkg-buildpackage: error: dpkg-source -b octonet gave error exit status 2
debian/rules:21: recipe for target 'debsrc' failed
make: *** [debsrc] Error 2
ERROR: Job failed: exit code 1