Merge master into dev

Merge version change from master