Improve performance by handling separate canvas & images better
Merge remote-tracking branch 'origin/master'