Version bump
Merge commit '4f8c2a5454e90bc8e5f66e2939a102717c225457' into v3