Merge remote-tracking branch 'esr/master'