removed the 'rc1' version suffix
Merge branch 'dev'