Grab latest changes from nilearn's master branch