Merge branch 'master' into hotfix/stupid_configure_bug