Added tag 0.3.36 for changeset 677bfe948e9bd48ed0ee8e42961108a746581df4