Merge remote-tracking branch 'origin/master' into oja-patch-1

Conflicts:
	src/api.js