Merge from emacs-24 branch; up to r108077
Update copyright notices for 2013.