Added tag 0.3-18 for changeset 7310c1a15d8ec2ce4c87e0525c8b2f4920bd00a5