Fix subtle year changes in formatting between JDK 6 and 7+

relates to #187