Merge "shared object on mac osx" into experimental