merge WordPress-Coding-Standards @ e16ca46b6d