avoid hooker issues
Merge remote-tracking branch 'origin/repeated-task-in-table' into repeated-task-in-table

Conflicts:
	time-grunt.js