Merge branch 'master' into release

diff --combined version
index b61be290f7df8d7aceb098bf16f4e72c2ce7d7ec,5e55414e45330856406520f2dd93b94f170af846..6205e5bf3ac1af7b825161d21a65a2d9547ad6d9
--- 1/version
--- 2/version
+++ b/version
@@@ -1,1 -1,1 +1,1 @@@
- v0.24.1
 -v0.25-dev
++v0.24.2