Make shared_ptr work with Log.
Merge remote branch 'refs/remotes/upstream/master'