.
Merge remote-tracking branch 'origin/master'
Conflicts solved by hand!!!