Merge branch 'master' into feature/wp/cache

# Conflicts:
#	src/plugins/wp/VCS.ml
#	src/plugins/wp/VCS.mli
#	src/plugins/wp/register.ml
#	src/plugins/wp/tests/wp_plugin/oracle_qualif/nth.0.res.oracle
#	src/plugins/wp/tests/wp_plugin/oracle_qualif/nth.1.res.oracle
#	src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.0.res.oracle
#	src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.1.res.oracle
#	src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.2.res.oracle
#	src/plugins/wp/wp_parameters.ml