Commit reference in the wrong spot
Merge branch 'master' into sijit0.2

Conflicts:
	packages.json