synchronization with beta branch
Merge branch 'master' into nook
introduces intermediate class ZLImageSelfSynchronizableProxy
Merge branch 'master' into nook
synchronization with beta branch
Merge branch 'master' into nook