Fix #1455
Merge remote-tracking branch 'stonebk/dev-master' into dev-master

Conflicts:
	src/event/js/tap.js
Event: Build.