merge spm@master