Merge remote-tracking branch 'origin/master' into Aufinal/prettify-revente