Re-minified with changes.
Merge branch 'develop'