Merge branch 'develop' into issue-213

Conflicts:
	extension/packages/events.coffee
Merge pull request #246 from lydell/issue-213

Merge branch 'develop' into issue-213