fix double-clicking
Merge branch 'master' into deploy