Merge remote-tracking branches 'origin/symbolic', 'origin/HEAD' and 'origin/master' into symbolic