Updated versions to 5.2.1-SNAPSHOT

Rebased correctly off of the 5.2.x branch. I realised I hadn't updated my remote branches correctly so I didn't see the 5.2.x branch on my command line. I've had problems with my sync_with_upstream so normally update things manually anyway.