Fix: [ bug #1649 ] Cancel button of several thirdparty actions, does the same thing as modify
Merge branch '3.6' into bug-1649

Conflicts:
	ChangeLog
Merge pull request #2171 from marcosgdf/bug-1649

Fix: [ bug #1649 ] Cancel button of several thirdparty actions, does the same thing as modify