Update to WP 3.6.1

See #947