Merged changes from master.