merged in master the change from 0.9-17 to 0.9-18 :