merge
merge

--HG--
branch : xp-test
merge

--HG--
branch : xp-test
update nano.js

--HG--
branch : wip-refactor
merge

--HG--
branch : wip-refactor
merge

--HG--
branch : wip-refactor
merge wip-refactor, since it's almost finished
merge