Pushed to master as 48b00a4c7efadbb654bf28e9e4e61bb23f70a964. Thanks.