Added tag 0.3.21 for changeset 6c6c7ebf37b0