Updated functional tests for compatibility with OS 10.10 while still maintaining GNU compatibility
Merge remote-tracking branch 'origin' into as