Fix to actually inline #ifNotNil:ifNil:
Merge branch 'master' into helios