I will probably rebase and redo the "move js/css" commits before merge, so that the latest changes from master are picked up here.

(I don't think git can handle a merge from master directly)