Merge remote branch 'osmandapp/upstream'
don't specify -Wl,-rpath argument on Darwin or Windows (take 2)