Add old alias due to backward compatibility.
Merge remote-tracking branch 'origin/master' into work/jessy