Merged patch into master.