Fixed version conflicts.
Merge branch 'develop'