Removing stray debug statements
Adding back in "other_name" changes that were accidentally removed
Merge remote branch 'origin/release' into lightweight_queue

Conflicts:
	api/database/queue.class.php