Resolved conflict in datetime's default input_type
Merge pull request #2674 from jchamberlain/2.2/develop

Resolved conflict in datetime's default input_type