Added tag 0.5-18 for changeset c510e3644e167d7b064a71ca3ef8038981a35e73