Merging develop-vrp 20130103...