o Synced version with main build (given that auth is currently broken and Hudson uses a secured repo, we better re-use stuff that has already been resolved...)