Pushed to master as commit 504910141efb9b586ec4ce5ceebdb3ced48488e9.

Thanks!