Improve error handling for init.d script (fix #187)
Merge branch 'atnnn_187' into next
Merge branch 'next' into sam_osxbuild
Merge branch 'sam_osxbuild' into sam_gtest