Merge tag 'v3.13-final' into maemo-port