Merge from development branch.
Bump subminor version