More elegant solution
Merge branch '3.8-branch' of github.com:codemasteroy/WordPress into 3.8-branch

Conflicts:
	wp-includes/class-wp-image-editor-gd.php