Fix potential ARC issue.
Merge branch 'master' into artwork-store