perform dist-upgrade
Merge remote-tracking branch 'upstream/master'