Changelog and build fix
Merge branch 'master' into TensorVoting
Merge remote-tracking branch 'dcoeurjo/TensorVoting' into TensorVoting
Merge branch 'TensorVoting' into Feature