Merge commit 985c6346387a0e01fdecf2e33c3ac8c8d5d4a759 from master.