delayed actions in image synchronisation (just a mechanism for)
fixed image initialization
Merge branch 'master' into ice-cream-sandwich