Bringing in Version 2.7
Adjust the caption handling when not using text links