Included changes in tensor/opt.py for #2454. These were previously lost due to problems committing to GitHub.