Upgraded to the latest version to fix images.
Merge branch 'upgrade' into develop