[sr-dev] git:master:93dc3552: Merge pull request #689 from sjthomason/solaris-studio-build