Ticket 2560

This pull request is for ticket 2560.