Add 'Last change: 2013 May 30' to headers
Merge upstream changes