Added tag 0.3-21 for changeset 348d2ce0f373b7ee4d49851c676f2576a65d83f2