Merge branch 'master' into jk/testium2

Conflicts:
	Makefile
	package.json