Pushed to master as b9914c479445a85b2caf284c50f8a242f0f8f0bd with minimal changes (to the commit message).

Thanks!