Last changes for Saturday night
Merge remote-tracking branch 'origin/master'