3.9.5

3.9.5 OS X update from main branch.