Merge branch 'master' into plugin-blockmap-patches-intellij