Ok.. Do this so we have access to both. The FT formatter likes datetimes.
Merge branch 'refs/heads/2.3/develop' into 3.0/develop