Code

Merge branch 'ab/sun-studio-portability'