minor tweak to enable installation on 32Bit OS X (10.6.x, 10.7.x)
Merge remote-tracking branch 'upstream/master'