Merge branch 'removed-timestamps' into safe-nil
Merge remote-tracking branch 'remotes/origin/gems-greater-than' into safe-nil