merge spmjs@master