Removed unused handler
Merge branch 'master' into polymer