Merge branch 'wordpress'
Cédric de Saint Martin authored
25395e72