Preparing for merge commit

Merging in less than a minute.