Merge remote-tracking branch 'duwanis/master'
Use is_a? when checking class in convert_date_or_time

The previous version was not converting Rails
ActiveSupport::TimeWithZone objects for me.