by marcoscortes: merge with pojobuilder version 2.4.1.