Merge remote-tracking branch 'mpe/master' into next