Travis fix for pull 729

A re-request of pull #729, including the recent Travis updates.