Merge branch 'hotfix/fix-nil-assignment-bug'
Fix various build warnings under Xcode 5.1
Merge branch 'fixes-5.1' into development