Fix build on Xcode6
Merge pull request #737 from openresearch/master

Fix build on Xcode6