Updated to current master of commonlib.