10.5 to 5.18
osx 10.6 to 5.18
Merge branch 'dev' into ms