Fix transition.delay method
Fix on reset, callback set to undefined
Merge remote-tracking branch 'public/master'