remove unused variables
Merge remote-tracking branch 'upstream/master' into remove-unused-variables

Conflicts:
	php/commands/media.php
Merge pull request #1466 from rodrigoprimo/remove-unused-variables

Remove unused variables