Release 1.2.4, Adapted for OS 10.9 DP1
merge latest zenith/master