Merge master to 1.05