Commit Mann
Merge branch 'master' into Bug1000