Merged
Merge branch 'VetoProjects-master'

* VetoProjects-master:
  Merged