[ALOY-1054] resolve compile errors on OS X
Merge pull request #462 from skypanther/ALOY-1054b

[ALOY-1054] resolve compile errors on OS X