Modified several optional un-wrappers for Xcode 6 beta 7
Merge remote-tracking branch 'origin/master'