Merged in fix-ros-sim-time-NUIT-93 (pull request #64) Approved-by: Eloy Retamino Approved-by: Stefano Nardo