Update from Dario, SVN rev. 117.