Updated CommonMakefiles module [ci skip]