Fix bin_or_sbin usage in solaris
Merge branch '1.3' into develop