Added tag 0.3-22 for changeset 7dea9033375d5bd7ccf96325a946275f37fc2ff9