Amazing commit message from @gilestalbot