fix merge
Merge branch '1.4.X' of github.com:excilys/gatling into 1.4.X