Supports custom aliases.
Documents custom aliases.
Updates package files.
Merges upstream.