Pin to WordPress 3.6
Merge remote-tracking branch 'upstream/master'

Conflicts:
	wp