Fixed bug with callback third parameter on some commands, Issue #1033
Merge branch 'master' into 2.0-dev