Local settings fixed.
Merge branch 'master' into local
Moving image, will need to figure way to do this in future.