Added tag 2.1.2 for changeset c6a011b90a37