Merge branches 'module1' and 'master'