Rebasing (re-use code in git subtree)

Hi @gllmflndn, you can merge this to update your pull request incf-nidash/nidm-results_spm#3 with the latest code in the master branch of that repository.