Merge branch 'sam_osx' into next
Merge branch 'next' into sam_2134_iii