Removed obsolete use of alias
Merge remote-tracking branch 'origin/master' into vaclav