merge spm@master style updates