WP 3.6 heartbeat API support
balance the padding
Merge branch 'feature/heartbeat' into develop