Updated timeaxisbase methods to format dates before comparing.
Merge remote-tracking branch 'upstream/dev-3.x' into dev-3.x

Merge upstream dev-3.x into local.