Added tag 1.0.21 for changeset e941cdb7c2edfb681422afc23f99a3545f9284f8