OK, I'm keen to have this fixed before we merge this though as people do use the master branch as a reliable source (has worked so far!)