temporary fix for xcode 5.1 clan error
Merge branch 'xcode_5.1_upgrade_error'