Tile skin workaround for non-2n-sized images on cpp target
Merge branch 'master' into dev