formatting
unused import
Merge branch 'master' into versionviewutil