Moving proxy stuff to branch (2/2)
Merge branch 'development' into ER-WeakProxy
Switching to ARC
ER-WeakProxy finished
Merge branch 'ER-WeakProxy' into development
Version bump
Merge branch 'Version-2.1' into development