Version 2.1, 5.2 compatible.
Added tag 2.1 for changeset f3a230a74391