Version bump to align with master.
Merging changes made to master.