Version history for #3504, as well as a minor change to the log message.
===VersionHistory:Complete===