Support for rectangular avatars.

Signed-off-by: Shige Abe <shige.abe@nasa.gov>