Bugs 1012833 and 1012855

Build on Mac OS X; pushing files corrupts them