Merge remote-tracking branch 'upstream/master' into archlinux_dev3
Merge remote-tracking branch 'thomas/archlinux_dev3' into archlinux_dev3