Cleaned up url generation, see WP Trac Issue #16953
Keep stable tag until the release of the new version