Changed reference modules/base to master