Backport fixes from 0.9 release

Conflicts:
	src/notification.js
	src/timer.js