Merge branch 'maint-0.3.3' into maint-0.3.4

diff --cc src/test/test_rust.sh
index b1eae7d5f2e1a0e52cdb13be063e913a49cca254,c7d0439ad1ff9effefa656d275a643a0eda0eb97..4ecca7834d199ef6d65374f3781d1a3869014b9f
--- 1/src/test/test_rust.sh
--- 2/src/test/test_rust.sh
+++ b/src/test/test_rust.sh
@@@ -9,8 -8,8 +9,8 @@@ for cargo_toml_dir in "${abs_top_srcdir
      if [ -e "${cargo_toml_dir}/Cargo.toml" ]; then
        cd "${cargo_toml_dir}" && \
            CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \
-           CARGO_HOME="${abs_top_builddir:-../../..}/src/rust" \
+           CARGO_HOME="${abs_top_builddir:-../../..}/src/rust/.cargo" \
 -          "${CARGO:-cargo}" test --all-features ${CARGO_ONLINE-"--frozen"} \
 +          "${CARGO:-cargo}" test ${CARGO_ONLINE-"--frozen"} \
            ${EXTRA_CARGO_OPTIONS} \
            --manifest-path "${cargo_toml_dir}/Cargo.toml" || exitcode=1
      fi