Finish pmahomme-theme-icon-credits
Merge remote-tracking branch 'origin/QA_4_0'