Merge branch '0.4-maintenance' into moya-0.4

Conflicts:
	package.json