Squashed commit of the following:

commit c7e6a45acf51e188969ce469860101621735851a
Author: Nicola Rizzo <nicola.rizzo@gmail.com>
Date:   Sat Jul 26 19:51:30 2014 +0200

    corrects the year number, fixes #17835; test updated

(cherry picked from commit 9b15b3f1dbdd34b27acaffdd38dce864e1e3ecfd)