OSX installer fixes
merge of '39b5dbad70638ec0105995a37c7e6e5ff499331a'
     and '8fbc18bc74b0507c5b238b3e849a02d020faabe1'