Merged in changes from development repository.

* threadsafe use of localtime
* changing/retrieving log filename at runtime (using futures)