Minor merged changes from py-source-sdk-2013
Updated vehicle navigator.