Cleaned up duplicate messages when building multiple modules
Merge branch 'master' into 0.7