Merge branch 'devel' into blaze-refactor

Conflicts:
	packages/deps/deps.js

(Mysterious conflict makes no sense.)