Try to make Travis happy based on Massimo's hints.
Merge commit '010c1ea' into HEAD