Update from Dario, SVN rev. 113.