Up to date CL.
Merge pull request #1619 from Lukasa/master

Up to date CL.