Fixed issue with yearly ticks being computed wrong, causing stagger lines where not necessary. Closes #2360.
Merge remote-tracking branch 'origin/master'