Pushed to master as 87ec1ae95c..73f68c1a45.