[wordpress/f17] (3 commits) ...fix merge issue

[Remi Collet]

Summary of changes:

  240dbed... update to 3.5.1 (security) (*)
  4c15a2b... Merge branch 'master' into f17
  fd22341... fix merge issue

(*) This commit already existed in another branch; no separate mail sent