Merging develop-vrp branch...

20130103