Merge 1.1.3 to master.