merge spmjs.io@master