Merge branch 'master'
Now can delete an action
Merge branch 'syb'