Update to current release trunk

(when the hell will they stop to update these original files?)