Fix a bug introduced by mn 6326 commit
Merge ../Barcelona-WP-InstaSites into 2014.10.22