Add rebase-master as a submodule
Merge branch 'master' into CVproxy