Update from CM releasetools