Merging master into spyware-voting