Update from SVN
Merge branch 'master' into vulninjections