Sync master branches

Sync my master branch with the visit-vis master branch.