Apply patch from Xojo to make project compile in light of 2014r3 compiler fixes.
Merge branch 'refs/heads/xojo_patch'

* refs/heads/xojo_patch:
  Apply patch from Xojo to make project compile in light of 2014r3 compiler fixes.