Installation folder renamed
Merge origin/master