Merge branch 'develop' into issue-213

Conflicts:
	extension/packages/events.coffee