Testing commit username fix
Merge origin/master