Added tag 0.3.21 for changeset 99936bc5be32