Merge commit 'daa77d1' into merge/2.10.x-to-master-1

Merged with `-s ours`, all commits in cbb88ac...daa77d1 where
backports to 2.10.x or changes to the 2.10.x build.

    git log --graph --oneline --decorate $MB...origin/2.10.x
    *   daa77d1 (origin/pr/3648, origin/2.10.x) Merge pull request #3602 from xeno-by/topic/backport-vampire-warni
    |\
    | * db300d4 (xenoby/topic/backport-vampire-warning, origin/pr/3602) [backport] no longer warns on calls to vam
    * |   43e06be Merge pull request #3643 from gkossakowski/2.10.5-nightlies
    |\ \
    | |/
    |/|
    | * a16e003 (origin/pr/3643) Bump version to 2.10.5 for nightly builds.
    |/
    *   b66a396 (tag: v2.10.4-RC3, tag: v2.10.4, xenoby/2.10.x, huit/2.10.x) Merge pull request #3491 from retrony
    |\
    | * 5f4011e (retronym/backport/7902, origin/pr/3491) [backport] SI-7902 Fix spurious kind error due to an unit
    |/
    *   5720e97 Merge pull request #3430 from som-snytt/issue/8205-backport
    |\
    | * 8ee165c (origin/pr/3430) SI-8205 [nomaster] backport test pos.lineContent
    *   50453ce Merge pull request #3415 from xeno-by/topic/reify210x
    |\
    | * d167f14 (origin/pr/3415) [nomaster] corrects an error in reify’s documentation
    |/
    *   6557570 Merge pull request #3359 from huitseeker/issue/VarianceAdaptations
    |\
    | * 806b6e4 (origin/pr/3359, huit/issue/VarianceAdaptations) Backports library changes related to SI-6566 from
    * d9ee69f Merge pull request #3367 from retronym/backport/3363
    * ff13742 (retronym/backport/3363, origin/pr/3367) [nomaster] SI-8146 Fix non-deterministic <:< for deeply nes
    * cbb88ac [nomaster] Update MiMa and use new wildcard filter

0 files changed, 0 insertions, 0 deletions