Merge pull request #2714 from drenty/master

Added asElapsedTime function to Formatter
Implemented conditional validators (see #2406)