Disable AppNap on MacOSX for EigenD
Merge remote-tracking branch 'upstream/2.1' into 2.1