merge spmjs:master