Resolved conflict.
Merge branch 'develop'