#136 Included version-osx in OSx build build
Merge remote-tracking branch 'origin/master' into migration