merge spmjs.io:master