merged upstream branch
added DateType and TimeType
reverting version number to upstream value