No bug: re-add cknowles, with an SSH key this time
Merge default -> production

--HG--
branch : production