Merged some changes from master.