Hide compilation details
Merge branch 'master' into develop