Added tag 0.5-20 for changeset ca963736e962108e12418cf17000543222711c54