fixed duplicate action cgi vars
Merge branch 'master' into develop