Adding second granularity to output directory names.
Merge branch 'next'