Testing SmartGit take 2
Merge branch 'master'