Truncated history
Test build.
Merge branch 'dev'

Conflicts:
	test/test-creation.js