Merging last changes from the trunk (parameterised config location).