converted to ARC, using auto synthesizing
Merge commit 'de79672'
Converting all tests to ARC