#834464 by vincent: Fixed call-time pass-by-reference deprecated warning. Also, switched to 6.x-2.x branch for committing changes instead og the HEAD branch.